summaryrefslogtreecommitdiff
path: root/lib/gitlab/ldap/person.rb
diff options
context:
space:
mode:
authorJan-Willem van der Meer <mail@jewilmeer.nl>2014-10-14 10:54:43 +0200
committerJan-Willem van der Meer <mail@jewilmeer.nl>2014-10-14 10:54:43 +0200
commit18d2ee31e81e617a4c860359cb29f9118b8a3e70 (patch)
tree2ed7f5c8067669e7fb9c756ecdde4b77c5c3829f /lib/gitlab/ldap/person.rb
parentd3056feb119de28a0e7333f80ee6d42ecf690dc5 (diff)
downloadgitlab-ce-18d2ee31e81e617a4c860359cb29f9118b8a3e70.tar.gz
Use server specific uid
Diffstat (limited to 'lib/gitlab/ldap/person.rb')
-rw-r--r--lib/gitlab/ldap/person.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/person.rb b/lib/gitlab/ldap/person.rb
index eae0a87a502..3e0b3e6cbf8 100644
--- a/lib/gitlab/ldap/person.rb
+++ b/lib/gitlab/ldap/person.rb
@@ -9,7 +9,7 @@ module Gitlab
attr_accessor :entry, :provider
def self.find_by_uid(uid, adapter)
- adapter.user(Gitlab.config.ldap.uid, uid)
+ adapter.user(adapter.config.uid, uid)
end
def self.find_by_dn(dn, adapter)