diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 09:09:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 09:09:14 +0300 |
| commit | 42f41de46525ce0065f02ee07c1a79f5669526a0 (patch) | |
| tree | 6e8151aae2628d2c2ce8942be1ba547afe0264b2 /lib/gitlab/auth | |
| parent | 1eeef229aae5affdce415c2364858e8efc64f4b5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/auth')
| -rw-r--r-- | lib/gitlab/auth/ldap/config.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth/ldap/config.rb b/lib/gitlab/auth/ldap/config.rb index 709cd0d787a..b8874e18a0b 100644 --- a/lib/gitlab/auth/ldap/config.rb +++ b/lib/gitlab/auth/ldap/config.rb @@ -178,7 +178,7 @@ module Gitlab def default_attributes { - 'username' => %w(uid sAMAccountName userid), + 'username' => %W(#{uid} uid sAMAccountName userid).uniq, 'email' => %w(mail email userPrincipalName), 'name' => 'cn', 'first_name' => 'givenName', |