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
path: root/lib
diff options
context:
space:
mode:
authorCasper <cgielen+gitlab@uvt.nl>2017-07-26 19:48:13 +0300
committerRémy Coutable <remy@rymai.me>2017-07-26 19:48:13 +0300
commita5d2ce8e61fc4f606148ec0323154421111c5012 (patch)
treeef6f1f9d596849b54dc9ea858d7969f039342269 /lib
parent0c563225b663742b4f26731dc7bc822a38f7289b (diff)
Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-coded attributes.
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ldap/adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb
index 7b05290e5cc..8867a91c244 100644
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -101,7 +101,7 @@ module Gitlab
end
def user_attributes
- %W(#{config.uid} cn mail dn)
+ %W(#{config.uid} cn dn) + config.attributes['username'] + config.attributes['email']
end
end
end