Fix authorization for LDAP login
This commit is contained in:
parent
23b692c701
commit
b229b0f003
2 changed files with 5 additions and 1 deletions
|
@ -45,6 +45,10 @@ module Gitlab
|
||||||
def adapter
|
def adapter
|
||||||
@adapter ||= Gitlab::LDAP::Adapter.new(provider)
|
@adapter ||= Gitlab::LDAP::Adapter.new(provider)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def ldap_config
|
||||||
|
Gitlab::LDAP::Config.new(provider)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -30,7 +30,7 @@ module Gitlab
|
||||||
|
|
||||||
def find_by_uid_and_provider
|
def find_by_uid_and_provider
|
||||||
self.class.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
|
end
|
||||||
|
|
||||||
def find_by_email
|
def find_by_email
|
||||||
|
|
Loading…
Reference in a new issue