Fix authorization for LDAP login

This commit is contained in:
Jan-Willem van der Meer 2014-10-14 09:40:35 +02:00
parent 23b692c701
commit b229b0f003
2 changed files with 5 additions and 1 deletions

View file

@ -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

View file

@ -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