diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-26 16:48:14 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-26 16:48:14 +0000 |
| commit | a64e3d08473c8e54d3817c95d9142fedf7096df9 (patch) | |
| tree | ef6f1f9d596849b54dc9ea858d7969f039342269 /lib | |
| parent | 0c563225b663742b4f26731dc7bc822a38f7289b (diff) | |
| parent | a5d2ce8e61fc4f606148ec0323154421111c5012 (diff) | |
| download | gitlab-ce-a64e3d08473c8e54d3817c95d9142fedf7096df9.tar.gz | |
Merge branch 'patch-24' into 'master'
Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-coded attributes.
See merge request !13054
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/adapter.rb | 2 |
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 |