summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-06-08 17:03:57 -0700
committerMichael Kozono <mkozono@gmail.com>2017-07-26 02:43:34 -0700
commit612b3864505a9e7445d09a80efa263cca9d8758d (patch)
treefc93e279be9a54221da7eab783eb100a59890a33 /lib
parentdcc12505aa121f809f6cf64fa7a68cc5457aca31 (diff)
downloadgitlab-ce-612b3864505a9e7445d09a80efa263cca9d8758d.tar.gz
Set `Net::LDAP` `ssl_version` option
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ldap/config.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb
index 983c79a6364..a48a485dffd 100644
--- a/lib/gitlab/ldap/config.rb
+++ b/lib/gitlab/ldap/config.rb
@@ -192,6 +192,7 @@ 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