diff options
| -rw-r--r-- | lib/gitlab/ldap/access.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/ldap/user.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb index 111c750226f..eb2c4e48ff2 100644 --- a/lib/gitlab/ldap/access.rb +++ b/lib/gitlab/ldap/access.rb @@ -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 diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb index 9235f6310df..3176e9790a7 100644 --- a/lib/gitlab/ldap/user.rb +++ b/lib/gitlab/ldap/user.rb @@ -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 |