Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
0b4eb7f2
Commit
0b4eb7f2
authored
Jun 09, 2017
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix code style
parent
71c36c5b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
lib/gitlab/ldap/config.rb
lib/gitlab/ldap/config.rb
+5
-5
No files found.
lib/gitlab/ldap/config.rb
View file @
0b4eb7f2
...
...
@@ -3,10 +3,10 @@ module Gitlab
module
LDAP
class
Config
NET_LDAP_ENCRYPTION_METHOD
=
{
:simple_tls
=>
:simple_tls
,
:start_tls
=>
:start_tls
,
:plain
=>
nil
}
simple_tls:
:simple_tls
,
start_tls:
:start_tls
,
plain:
nil
}
.
freeze
attr_accessor
:provider
,
:options
...
...
@@ -170,7 +170,7 @@ module Gitlab
def
encryption_options
method
=
translate_method
(
options
[
'encryption'
])
options
=
{
method:
method
}
options
.
merge!
(
tls_options:
tls_options
(
method
)
)
if
method
options
[
:tls_options
]
=
tls_options
(
method
)
if
method
options
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment