diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 18:21:45 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 18:21:45 +0100 |
| commit | d66c48b303b00b731540dfa928ea151295ced5d4 (patch) | |
| tree | 48001cbfb4f8d0e96bf210df93a2e96d8cbf7805 /lib/gitlab/ldap/config.rb | |
| parent | f40373329f34b56647945522fccad3202ceafcde (diff) | |
| parent | 3d162d192ba2a57776de62b553a2a0a9a9245f8a (diff) | |
| download | gitlab-ce-d66c48b303b00b731540dfa928ea151295ced5d4.tar.gz | |
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'lib/gitlab/ldap/config.rb')
| -rw-r--r-- | lib/gitlab/ldap/config.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb index c8f19cd52d5..0d9a554fc18 100644 --- a/lib/gitlab/ldap/config.rb +++ b/lib/gitlab/ldap/config.rb @@ -148,7 +148,7 @@ module Gitlab def default_attributes { - 'username' => %w(uid userid sAMAccountName), + 'username' => %w(uid sAMAccountName userid), 'email' => %w(mail email userPrincipalName), 'name' => 'cn', 'first_name' => 'givenName', |