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