An error occurred while fetching the assigned milestone of the selected merge_request.
5 0 stable
Compare changes
Files
2- Dmitriy Zaporozhets authored
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
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 2
− 1
@@ -22,7 +22,8 @@ gem 'omniauth-twitter'
@@ -22,7 +22,8 @@ gem 'omniauth-twitter'
gem 'omniauth-github'
gem 'omniauth-github'
gem "gitlab-grit", '~> 1.0.0', require: 'grit'
gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: 'c15e2758ec75f99230cd0fbcc9110bf932c0bf05'