Commit e8da077d authored by Jacob Vosmaer's avatar Jacob Vosmaer Committed by Valery Sizov

Fix LDAP authentication for Git HTTP access

Conflicts:
	CHANGELOG
parent ba76dbc3
v 7.4.1
- Fix LDAP authentication for Git HTTP access
v 7.4.0 v 7.4.0
- Refactored membership logic - Refactored membership logic
- Improve error reporting on users API (Julien Bianchi) - Improve error reporting on users API (Julien Bianchi)
......
...@@ -42,7 +42,7 @@ module Gitlab ...@@ -42,7 +42,7 @@ module Gitlab
end end
def adapter def adapter
OmniAuth::LDAP::Adaptor.new(config.options) OmniAuth::LDAP::Adaptor.new(config.options.symbolize_keys)
end end
def config def config
...@@ -68,4 +68,4 @@ module Gitlab ...@@ -68,4 +68,4 @@ module Gitlab
end end
end end
end end
end end
\ No newline at end of file
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