mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-15 23:56:09 +10:00
Merge branch 'ldap_http_access' into 'master'
Fix LDAP authentication for Git HTTP access See merge request !1211
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
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
|
||||
|
||||
@@ -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
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user