Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-04-13 12:04:31 +0300
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-04-13 12:04:31 +0300
commit325b66365bc0bac4c17398dca397cfa30637de24 (patch)
tree1f8da445be4bcc89e1df99de739778c084b9fea3 /lib/gitlab/ldap/user.rb
parent896ea2482bd78f3683140bb8aa08f0583a58361e (diff)
Remove special cases for the 'ldap' provider
Diffstat (limited to 'lib/gitlab/ldap/user.rb')
-rw-r--r--lib/gitlab/ldap/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index b04f5b4ac37..75026aeaeb2 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -13,7 +13,7 @@ module Gitlab
def find_by_uid_and_provider(uid, provider)
# LDAP distinguished name is case-insensitive
identity = ::Identity.
- where(provider: [provider, :ldap]).
+ where(provider: provider).
where('lower(extern_uid) = ?', uid.downcase).last
identity && identity.user
end