Merge branch 'ldap_http_access' into 'master'

Fix LDAP authentication for Git HTTP access

See merge request !1211
This commit is contained in:
Marin Jankovski
2014-10-23 14:41:03 +00:00
2 changed files with 3 additions and 2 deletions
+1
View File
@@ -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
+2 -2
View File
@@ -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