Commit 568d6089 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'ldap_http_access' into 'master'

Fix LDAP authentication for Git HTTP access

See merge request !1211
parents 30eaf484 6b2b20af
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
\ No newline at end of file
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment