summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-06-09 10:30:38 -0700
committerMichael Kozono <mkozono@gmail.com>2017-07-26 02:43:36 -0700
commit2d7d1fa69db2b5e0056d5ab8884684886229f852 (patch)
tree0cb7cb14dc30701f34325b27671684b897a9582c /lib
parentc8dd77de81f42c593dcbf0b373afd0ab33f18071 (diff)
downloadgitlab-ce-2d7d1fa69db2b5e0056d5ab8884684886229f852.tar.gz
Pass configured `ssl_version` to `omniauth-ldap`
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ldap/config.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb
index 3f88e20bbec..efc3c50e038 100644
--- a/lib/gitlab/ldap/config.rb
+++ b/lib/gitlab/ldap/config.rb
@@ -74,6 +74,8 @@ module Gitlab
end
opts[:ca_file] = options['ca_file'] if options['ca_file'].present?
+ opts[:ssl_version] = options['ssl_version'] if options['ssl_version'].present?
+
opts
end