Download as
Browse Code »

Commit e998257dcf3a0e4a46305a8c6019e74fcce2887f

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

use rollbacked version of grit to make gollum works

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
Gemfile
  Diff comments   View file @e998257
... ... @@ -23,7 +23,7 @@ gem 'omniauth-github'
23 23  
24 24 # Extracting information from a git repository
25 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", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: '42297cdcee16284d2e4eff23d41377f52fc28b9d'
27 27 gem 'grit_ext', '~> 0.8.1'
28 28  
29 29 # Ruby/Rack Git Smart-HTTP Server Handler
... ...
Gemfile.lock
  Diff comments   View file @e998257
... ... @@ -8,8 +8,8 @@ GIT
8 8  
9 9 GIT
10 10 remote: https://github.com/gitlabhq/grit.git
11   - revision: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
12   - ref: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
  11 + revision: 42297cdcee16284d2e4eff23d41377f52fc28b9d
  12 + ref: 42297cdcee16284d2e4eff23d41377f52fc28b9d
13 13 specs:
14 14 grit (2.5.0)
15 15 diff-lcs (~> 1.1)
... ...