summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-26 08:19:32 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-07-26 08:19:32 +0000
commitb0e30e8608f8307592d331bc8f852ba710046c89 (patch)
treef93d81dac07397f34e9583f67869d087703198cb /Gemfile
parent49b99d835daf86014adf5cdccae8857f0ab48247 (diff)
parenta872c3e886528016d5383ef9260277b8120e2cc4 (diff)
downloadgitlab-ce-b0e30e8608f8307592d331bc8f852ba710046c89.tar.gz
Merge branch 'bump-omniauth-ldap-gem-version' into 'master'
Bumps Gitlab Omniauth LDAP version See merge request !13059
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 7c7122a39ea..5bc8569a9e0 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.3', require: 'omniauth-ldap'
# Git Wiki
# Required manually in config/initializers/gollum.rb to control load order