5 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
@@ -26,7 +26,7 @@ gem 'omniauth-github'
@@ -26,7 +26,7 @@ gem 'omniauth-github'
gem 'gitlab_git', '~> 1.2.1'
gem 'gitlab_git', '~> 1.2.1'
gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"