deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Prevent gollum to overrride gitlab-grit gem. Use grit as instead so gollum uses it too. Fixes things with gpg singatured commits, etc.

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-29 08:47:14 +02:00
parent a18ce40943
commit 49f14f057d
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -22,7 +22,8 @@ gem 'omniauth-twitter'
gem 'omniauth-github'
# Extracting information from a git repository
gem "gitlab-grit", '~> 1.0.0', require: 'grit'
# Since gollum requires grit we cannot use gitlab-grit gem name any more. Use grit instead
gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: 'c40a32432616a07fa7fc3c32c24ab73ad6a9718f'
gem 'grit_ext', '~> 0.8.1'
# Ruby/Rack Git Smart-HTTP Server Handler