summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-06-09 08:27:39 -0700
committerMichael Kozono <mkozono@gmail.com>2017-07-26 02:43:32 -0700
commit8ab29d569e8c0019bbe458dea6f05a9894f0711a (patch)
tree8fa0619578c288d13222308a565b94cb89062f2a /Gemfile
parent886b0744949c9d10c21e39e192a0ec48c206fb40 (diff)
downloadgitlab-ce-8ab29d569e8c0019bbe458dea6f05a9894f0711a.tar.gz
Upgrade omniauth-ldap gem (and some dependencies)
Most notably, the net-ldap gem.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 7c7122a39ea..276893d0ff4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,7 +61,7 @@ gem 'browser', '~> 2.2'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.0.1', require: 'omniauth-ldap'
# Git Wiki
# Required manually in config/initializers/gollum.rb to control load order