Commit b229b0f0 by Jan-Willem

Fix authorization for LDAP login

parent 23b692c7
......@@ -45,6 +45,10 @@ module Gitlab
def adapter
@adapter ||= Gitlab::LDAP::Adapter.new(provider)
end
def ldap_config
Gitlab::LDAP::Config.new(provider)
end
end
end
end
......@@ -30,7 +30,7 @@ module Gitlab
def find_by_uid_and_provider
self.class.find_by_uid_and_provider(
auth_hash.provider, auth_hash.uid.downcase)
auth_hash.uid.downcase, auth_hash.provider)
end
def find_by_email
......
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