Download as
Browse Code »

Commit 34136d381fe733e7465700a043c7a3a27c8c0ec6

Authored by Dmitriy Zaporozhets
1 parent 65156e36

Use latest gitlab-grit fork to prevent gollum override gitlab-grit. Fixes issues… 

… related to gpg signed commits and other fixes from gitlab/grit fork
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: 'c15e2758ec75f99230cd0fbcc9110bf932c0bf05'
26 gem 'grit_ext', '~> 0.6.2' 27 gem 'grit_ext', '~> 0.6.2'
27 28
28 # Ruby/Rack Git Smart-HTTP Server Handler 29 # Ruby/Rack Git Smart-HTTP Server Handler
@@ -24,6 +24,16 @@ GIT @@ -24,6 +24,16 @@ GIT
24 rake (>= 0.8.7) 24 rake (>= 0.8.7)
25 25
26 GIT 26 GIT
  27 + remote: https://github.com/gitlabhq/grit.git
  28 + revision: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
  29 + ref: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
  30 + specs:
  31 + grit (2.5.0)
  32 + diff-lcs (~> 1.1)
  33 + mime-types (~> 1.15)
  34 + posix-spawn (~> 0.3.6)
  35 +
  36 +GIT
27 remote: https://github.com/gitlabhq/raphael-rails.git 37 remote: https://github.com/gitlabhq/raphael-rails.git
28 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58 38 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
29 specs: 39 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.6.2) 203 grit_ext (0.6.2)
202 charlock_holmes (~> 0.6.9) 204 charlock_holmes (~> 0.6.9)
203 growl (1.0.3) 205 growl (1.0.3)
@@ -521,7 +523,6 @@ DEPENDENCIES @@ -521,7 +523,6 @@ DEPENDENCIES
521 github-linguist (~> 2.3.4) 523 github-linguist (~> 2.3.4)
522 github-markup (~> 0.7.4) 524 github-markup (~> 0.7.4)
523 gitlab-grack (~> 1.0.0) 525 gitlab-grack (~> 1.0.0)
524 - gitlab-grit (~> 1.0.0)  
525 gitlab-pygments.rb (~> 0.3.2) 526 gitlab-pygments.rb (~> 0.3.2)
526 gitlab_meta (= 5.0) 527 gitlab_meta (= 5.0)
527 gitlab_omniauth-ldap (= 1.0.2) 528 gitlab_omniauth-ldap (= 1.0.2)
@@ -530,6 +531,7 @@ DEPENDENCIES @@ -530,6 +531,7 @@ DEPENDENCIES
530 gon 531 gon
531 grape (~> 0.3.1) 532 grape (~> 0.3.1)
532 grape-entity (~> 0.2.0) 533 grape-entity (~> 0.2.0)
  534 + grit (~> 2.5.0)!
533 grit_ext (~> 0.6.2) 535 grit_ext (~> 0.6.2)
534 growl 536 growl
535 guard-rspec 537 guard-rspec