diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-29 08:47:14 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-29 08:47:14 +0200 |
| commit | 49f14f057d6deb0903ae4e9b876c89f717f85f10 (patch) | |
| tree | 9c8740c00bbdfcf01e2a530980486920727bef1d /Gemfile | |
| parent | a18ce409431dfad00af137bf3983bb0f456d2485 (diff) | |
| download | gitlab-ce-49f14f057d6deb0903ae4e9b876c89f717f85f10.tar.gz | |
Prevent gollum to overrride gitlab-grit gem. Use grit as instead so gollum uses it too. Fixes things with gpg singatured commits, etc.
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |