Download as
Browse Code »

Commit 49f14f057d6deb0903ae4e9b876c89f717f85f10

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

Prevent gollum to overrride gitlab-grit gem. Use grit as instead so gollum uses … 

…it too. Fixes things with gpg singatured commits, etc.
Showing 2 changed files with 13 additions and 10 deletions   Show diff stats
@@ -22,7 +22,8 @@ gem 'omniauth-twitter' @@ -22,7 +22,8 @@ gem 'omniauth-twitter'
22 gem 'omniauth-github' 22 gem 'omniauth-github'
23 23
24 # Extracting information from a git repository 24 # Extracting information from a git repository
25 -gem "gitlab-grit", '~> 1.0.0', require: 'grit' 25 +# Since gollum requires grit we cannot use gitlab-grit gem name any more. Use grit instead
  26 +gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: 'c40a32432616a07fa7fc3c32c24ab73ad6a9718f'
26 gem 'grit_ext', '~> 0.8.1' 27 gem 'grit_ext', '~> 0.8.1'
27 28
28 # Ruby/Rack Git Smart-HTTP Server Handler 29 # Ruby/Rack Git Smart-HTTP Server Handler
@@ -7,6 +7,16 @@ GIT @@ -7,6 +7,16 @@ GIT
7 rake (>= 0.8.7) 7 rake (>= 0.8.7)
8 8
9 GIT 9 GIT
  10 + remote: https://github.com/gitlabhq/grit.git
  11 + revision: c40a32432616a07fa7fc3c32c24ab73ad6a9718f
  12 + ref: c40a32432616a07fa7fc3c32c24ab73ad6a9718f
  13 + specs:
  14 + grit (2.5.0)
  15 + diff-lcs (~> 1.1)
  16 + mime-types (~> 1.15)
  17 + posix-spawn (~> 0.3.6)
  18 +
  19 +GIT
10 remote: https://github.com/gitlabhq/raphael-rails.git 20 remote: https://github.com/gitlabhq/raphael-rails.git
11 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58 21 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
12 specs: 22 specs:
@@ -166,10 +176,6 @@ GEM @@ -166,10 +176,6 @@ GEM
166 github-markup (0.7.5) 176 github-markup (0.7.5)
167 gitlab-grack (1.0.0) 177 gitlab-grack (1.0.0)
168 rack (~> 1.4.1) 178 rack (~> 1.4.1)
169 - gitlab-grit (1.0.0)  
170 - diff-lcs (~> 1.1)  
171 - mime-types (~> 1.15)  
172 - posix-spawn (~> 0.3.6)  
173 gitlab-pygments.rb (0.3.2) 179 gitlab-pygments.rb (0.3.2)
174 posix-spawn (~> 0.3.6) 180 posix-spawn (~> 0.3.6)
175 yajl-ruby (~> 1.1.0) 181 yajl-ruby (~> 1.1.0)
@@ -194,10 +200,6 @@ GEM @@ -194,10 +200,6 @@ GEM
194 grape-entity (0.2.0) 200 grape-entity (0.2.0)
195 activesupport 201 activesupport
196 multi_json (>= 1.3.2) 202 multi_json (>= 1.3.2)
197 - grit (2.5.0)  
198 - diff-lcs (~> 1.1)  
199 - mime-types (~> 1.15)  
200 - posix-spawn (~> 0.3.6)  
201 grit_ext (0.8.1) 203 grit_ext (0.8.1)
202 charlock_holmes (~> 0.6.9) 204 charlock_holmes (~> 0.6.9)
203 growl (1.0.3) 205 growl (1.0.3)
@@ -524,7 +526,6 @@ DEPENDENCIES @@ -524,7 +526,6 @@ DEPENDENCIES
524 github-linguist (~> 2.3.4) 526 github-linguist (~> 2.3.4)
525 github-markup (~> 0.7.4) 527 github-markup (~> 0.7.4)
526 gitlab-grack (~> 1.0.0) 528 gitlab-grack (~> 1.0.0)
527 - gitlab-grit (~> 1.0.0)  
528 gitlab-pygments.rb (~> 0.3.2) 529 gitlab-pygments.rb (~> 0.3.2)
529 gitlab_meta (= 5.0) 530 gitlab_meta (= 5.0)
530 gitlab_omniauth-ldap (= 1.0.2) 531 gitlab_omniauth-ldap (= 1.0.2)
@@ -533,6 +534,7 @@ DEPENDENCIES @@ -533,6 +534,7 @@ DEPENDENCIES
533 gon 534 gon
534 grape (~> 0.3.1) 535 grape (~> 0.3.1)
535 grape-entity (~> 0.2.0) 536 grape-entity (~> 0.2.0)
  537 + grit (~> 2.5.0)!
536 grit_ext (~> 0.8.1) 538 grit_ext (~> 0.8.1)
537 growl 539 growl
538 guard-rspec 540 guard-rspec