An error occurred while fetching the assigned milestone of the selected merge_request.
6 2 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
@@ -24,7 +24,7 @@ gem 'omniauth-github'
@@ -24,7 +24,7 @@ gem 'omniauth-github'
gem "gitlab_git", "~> 3.0.0.rc1"
gem "gitlab_git", "~> 3.0.0.rc2"
gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
gem 'gitlab-grack', '~> 1.0.1', require: 'grack'