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
Boxiang Sun
gitlab-ce
Commits
bac7d17c
Commit
bac7d17c
authored
Jun 19, 2014
by
Boris HUISGEN
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix LDAP TLS authentication
parent
67934145
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
lib/gitlab/ldap/adapter.rb
lib/gitlab/ldap/adapter.rb
+9
-1
No files found.
lib/gitlab/ldap/adapter.rb
View file @
bac7d17c
...
...
@@ -14,7 +14,15 @@ module Gitlab
end
def
self
.
adapter_options
encryption
=
config
[
'method'
].
to_s
==
'ssl'
?
:simple_tls
:
nil
encryption
=
case
config
[
'method'
].
to_s
when
'ssl'
:simple_tls
when
'tls'
:start_tls
else
nil
end
options
=
{
host:
config
[
'host'
],
...
...
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