Download as
Browse Code »

Commit 128ef337078298966e499365e7dcb6272606b3b5

Authored by Dmitriy Zaporozhets
1 parent 88c741dd
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

use rubygems for gitlab_git gem

Showing 2 changed files with 6 additions and 10 deletions   Show diff stats
@@ -23,7 +23,7 @@ gem 'omniauth-github' @@ -23,7 +23,7 @@ gem 'omniauth-github'
23 23
24 # Extracting information from a git repository 24 # Extracting information from a git repository
25 # Provide access to Gitlab::Git library 25 # Provide access to Gitlab::Git library
26 -gem 'gitlab_git', path: '../gitlab_git'#'~> 1.4.1' 26 +gem "gitlab_git", "~> 2.0.0.pre"
27 27
28 # Ruby/Rack Git Smart-HTTP Server Handler 28 # Ruby/Rack Git Smart-HTTP Server Handler
29 gem 'gitlab-grack', '~> 1.0.1', require: 'grack' 29 gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
@@ -12,14 +12,6 @@ GIT @@ -12,14 +12,6 @@ GIT
12 specs: 12 specs:
13 raphael-rails (2.1.0) 13 raphael-rails (2.1.0)
14 14
15 -PATH  
16 - remote: ../gitlab_git  
17 - specs:  
18 - gitlab_git (1.4.1)  
19 - activesupport (~> 3.2.13)  
20 - github-linguist (~> 2.3.4)  
21 - gitlab-grit (~> 2.6.0)  
22 -  
23 GEM 15 GEM
24 remote: https://rubygems.org/ 16 remote: https://rubygems.org/
25 specs: 17 specs:
@@ -184,6 +176,10 @@ GEM @@ -184,6 +176,10 @@ GEM
184 gitlab-pygments.rb (0.3.2) 176 gitlab-pygments.rb (0.3.2)
185 posix-spawn (~> 0.3.6) 177 posix-spawn (~> 0.3.6)
186 yajl-ruby (~> 1.1.0) 178 yajl-ruby (~> 1.1.0)
  179 + gitlab_git (2.0.0.pre)
  180 + activesupport (~> 3.2.13)
  181 + github-linguist (~> 2.3.4)
  182 + gitlab-grit (~> 2.6.0)
187 gitlab_meta (6.0) 183 gitlab_meta (6.0)
188 gitlab_omniauth-ldap (1.0.3) 184 gitlab_omniauth-ldap (1.0.3)
189 net-ldap (~> 0.3.1) 185 net-ldap (~> 0.3.1)
@@ -572,7 +568,7 @@ DEPENDENCIES @@ -572,7 +568,7 @@ DEPENDENCIES
572 gitlab-gollum-lib (~> 1.0.1) 568 gitlab-gollum-lib (~> 1.0.1)
573 gitlab-grack (~> 1.0.1) 569 gitlab-grack (~> 1.0.1)
574 gitlab-pygments.rb (~> 0.3.2) 570 gitlab-pygments.rb (~> 0.3.2)
575 - gitlab_git! 571 + gitlab_git (~> 2.0.0.pre)
576 gitlab_meta (= 6.0) 572 gitlab_meta (= 6.0)
577 gitlab_omniauth-ldap (= 1.0.3) 573 gitlab_omniauth-ldap (= 1.0.3)
578 gon 574 gon