Download as
Browse Code »

Commit f38435b9e79cc155bc725300a5aa920f17c69271

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

Use real gems 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 11 additions and 19 deletions   Show diff stats
@@ -30,10 +30,10 @@ gem &#39;omniauth-github&#39; @@ -30,10 +30,10 @@ gem &#39;omniauth-github&#39;
30 30
31 # Extracting information from a git repository 31 # Extracting information from a git repository
32 # Provide access to Gitlab::Git library 32 # Provide access to Gitlab::Git library
33 -gem "gitlab_git", "~> 3.1.0", path: '../gitlab_git' 33 +gem "gitlab_git", "~> 4.0.0.pre"
34 34
35 # Ruby/Rack Git Smart-HTTP Server Handler 35 # Ruby/Rack Git Smart-HTTP Server Handler
36 -gem 'gitlab-grack', '~> 1.1.0', require: 'grack', path: '../grack' 36 +gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
37 37
38 # LDAP Auth 38 # LDAP Auth
39 gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap" 39 gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
1 -PATH  
2 - remote: ../gitlab_git  
3 - specs:  
4 - gitlab_git (3.1.0)  
5 - activesupport (~> 4.0.0)  
6 - gitlab-grit (~> 2.6.1)  
7 - gitlab-linguist (~> 2.9.5)  
8 - gitlab-pygments.rb (~> 0.5.4)  
9 -  
10 -PATH  
11 - remote: ../grack  
12 - specs:  
13 - gitlab-grack (1.1.0)  
14 - rack (~> 1.5.1)  
15 -  
16 GEM 1 GEM
17 remote: https://rubygems.org/ 2 remote: https://rubygems.org/
18 specs: 3 specs:
@@ -190,6 +175,8 @@ GEM @@ -190,6 +175,8 @@ GEM
190 nokogiri (~> 1.5.9) 175 nokogiri (~> 1.5.9)
191 sanitize (~> 2.0.3) 176 sanitize (~> 2.0.3)
192 stringex (~> 1.5.1) 177 stringex (~> 1.5.1)
  178 + gitlab-grack (2.0.0.pre)
  179 + rack (~> 1.5.1)
193 gitlab-grit (2.6.3) 180 gitlab-grit (2.6.3)
194 charlock_holmes (~> 0.6.9) 181 charlock_holmes (~> 0.6.9)
195 diff-lcs (~> 1.1) 182 diff-lcs (~> 1.1)
@@ -203,6 +190,11 @@ GEM @@ -203,6 +190,11 @@ GEM
203 gitlab-pygments.rb (0.5.4) 190 gitlab-pygments.rb (0.5.4)
204 posix-spawn (~> 0.3.6) 191 posix-spawn (~> 0.3.6)
205 yajl-ruby (~> 1.1.0) 192 yajl-ruby (~> 1.1.0)
  193 + gitlab_git (4.0.0.pre)
  194 + activesupport (~> 4.0.0)
  195 + gitlab-grit (~> 2.6.1)
  196 + gitlab-linguist (~> 2.9.5)
  197 + gitlab-pygments.rb (~> 0.5.4)
206 gitlab_meta (6.0) 198 gitlab_meta (6.0)
207 gitlab_omniauth-ldap (1.0.3) 199 gitlab_omniauth-ldap (1.0.3)
208 net-ldap (~> 0.3.1) 200 net-ldap (~> 0.3.1)
@@ -603,10 +595,10 @@ DEPENDENCIES @@ -603,10 +595,10 @@ DEPENDENCIES
603 github-markup (~> 0.7.4) 595 github-markup (~> 0.7.4)
604 gitlab-flowdock-git-hook (~> 0.4.2) 596 gitlab-flowdock-git-hook (~> 0.4.2)
605 gitlab-gollum-lib (~> 1.0.2) 597 gitlab-gollum-lib (~> 1.0.2)
606 - gitlab-grack (~> 1.1.0)! 598 + gitlab-grack (~> 2.0.0.pre)
607 gitlab-linguist (~> 2.9.6) 599 gitlab-linguist (~> 2.9.6)
608 gitlab-pygments.rb (~> 0.5.4) 600 gitlab-pygments.rb (~> 0.5.4)
609 - gitlab_git (~> 3.1.0)! 601 + gitlab_git (~> 4.0.0.pre)
610 gitlab_meta (= 6.0) 602 gitlab_meta (= 6.0)
611 gitlab_omniauth-ldap (= 1.0.3) 603 gitlab_omniauth-ldap (= 1.0.3)
612 gon 604 gon