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
Tatuya Kamada
gitlab-ce
Commits
568d6089
Commit
568d6089
authored
Oct 23, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ldap_http_access' into 'master'
Fix LDAP authentication for Git HTTP access See merge request !1211
parents
30eaf484
6b2b20af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/ldap/authentication.rb
lib/gitlab/ldap/authentication.rb
+2
-2
No files found.
CHANGELOG
View file @
568d6089
v 7.5.0
- API: Add support for Hipchat (Kevin Houdebert)
- Add time zone configuration on gitlab.yml (Sullivan Senechal)
- Fix LDAP authentication for Git HTTP access
v 7.4.0
- Refactored membership logic
...
...
lib/gitlab/ldap/authentication.rb
View file @
568d6089
...
...
@@ -42,7 +42,7 @@ module Gitlab
end
def
adapter
OmniAuth
::
LDAP
::
Adaptor
.
new
(
config
.
options
)
OmniAuth
::
LDAP
::
Adaptor
.
new
(
config
.
options
.
symbolize_keys
)
end
def
config
...
...
@@ -68,4 +68,4 @@ module Gitlab
end
end
end
end
\ No newline at end of file
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