summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2018-05-29 15:33:13 -0500
committerDrew Blessing <drew@blessing.io>2019-03-04 10:27:43 -0600
commitf6350faca1a9680c3ab8f68a05f289c89a4a2272 (patch)
treeab808414294048953eb33f746e93c59ae82bb329 /Gemfile
parentbc4ee49ecb1e562543cd196e51eac9a61c016de3 (diff)
downloadgitlab-ce-f6350faca1a9680c3ab8f68a05f289c89a4a2272.tar.gz
Allow raw `tls_options` to be passed in LDAP configuration
We've previously exposed ca_file and ssl_version but there are many possible options that can be used inside tls_options. Instead of exposing individual ones, simply expose the entire hash so it can be passed in and we won't have to add things in the future.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 0178ca9f352..03d67810faa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,7 @@ gem 'gpgme', '~> 2.0.18'
# 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', '~> 2.0.4', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap'
# API