kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix code style

This commit is contained in:
Michael Kozono 2017-06-09 11:47:20 -07:00
parent 71c36c5bb4
commit 0b4eb7f218
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gitlab/ldap/config.rb
View File

@ -3,10 +3,10 @@ module Gitlab
module LDAP module LDAP
class Config class Config
NET_LDAP_ENCRYPTION_METHOD = { NET_LDAP_ENCRYPTION_METHOD = {
:simple_tls => :simple_tls, simple_tls: :simple_tls,
:start_tls => :start_tls, start_tls: :start_tls,
:plain => nil plain: nil
} }.freeze
attr_accessor :provider, :options attr_accessor :provider, :options
@ -170,7 +170,7 @@ module Gitlab
def encryption_options def encryption_options
method = translate_method(options['encryption']) method = translate_method(options['encryption'])
options = { method: method } options = { method: method }
options.merge!(tls_options: tls_options(method)) if method options[:tls_options] = tls_options(method) if method
options options
end end