Commit 49f14f057d6deb0903ae4e9b876c89f717f85f10
1 parent
a18ce409
Exists in
master
and in
4 other branches
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
Gemfile
| ... | ... | @@ -22,7 +22,8 @@ gem 'omniauth-twitter' |
| 22 | 22 | gem 'omniauth-github' |
| 23 | 23 | |
| 24 | 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 | 27 | gem 'grit_ext', '~> 0.8.1' |
| 27 | 28 | |
| 28 | 29 | # Ruby/Rack Git Smart-HTTP Server Handler | ... | ... |
Gemfile.lock
| ... | ... | @@ -7,6 +7,16 @@ GIT |
| 7 | 7 | rake (>= 0.8.7) |
| 8 | 8 | |
| 9 | 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 | 20 | remote: https://github.com/gitlabhq/raphael-rails.git |
| 11 | 21 | revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58 |
| 12 | 22 | specs: |
| ... | ... | @@ -166,10 +176,6 @@ GEM |
| 166 | 176 | github-markup (0.7.5) |
| 167 | 177 | gitlab-grack (1.0.0) |
| 168 | 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 | 179 | gitlab-pygments.rb (0.3.2) |
| 174 | 180 | posix-spawn (~> 0.3.6) |
| 175 | 181 | yajl-ruby (~> 1.1.0) |
| ... | ... | @@ -194,10 +200,6 @@ GEM |
| 194 | 200 | grape-entity (0.2.0) |
| 195 | 201 | activesupport |
| 196 | 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 | 203 | grit_ext (0.8.1) |
| 202 | 204 | charlock_holmes (~> 0.6.9) |
| 203 | 205 | growl (1.0.3) |
| ... | ... | @@ -524,7 +526,6 @@ DEPENDENCIES |
| 524 | 526 | github-linguist (~> 2.3.4) |
| 525 | 527 | github-markup (~> 0.7.4) |
| 526 | 528 | gitlab-grack (~> 1.0.0) |
| 527 | - gitlab-grit (~> 1.0.0) | |
| 528 | 529 | gitlab-pygments.rb (~> 0.3.2) |
| 529 | 530 | gitlab_meta (= 5.0) |
| 530 | 531 | gitlab_omniauth-ldap (= 1.0.2) |
| ... | ... | @@ -533,6 +534,7 @@ DEPENDENCIES |
| 533 | 534 | gon |
| 534 | 535 | grape (~> 0.3.1) |
| 535 | 536 | grape-entity (~> 0.2.0) |
| 537 | + grit (~> 2.5.0)! | |
| 536 | 538 | grit_ext (~> 0.8.1) |
| 537 | 539 | growl |
| 538 | 540 | guard-rspec | ... | ... |