diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-28 13:28:54 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-28 13:28:54 +0000 |
| commit | e6fbf79bc51c6a466d7fa880adb598cded41707a (patch) | |
| tree | 6a649ced45abaeed4e4bdee6fd66663bda786d21 /lib | |
| parent | 4af38885dfee57fee5e7a61ed59987a5454d5714 (diff) | |
| parent | 2e6b537018062b8407411e7bd51327f797f2fe1f (diff) | |
| download | gitlab-ce-e6fbf79bc51c6a466d7fa880adb598cded41707a.tar.gz | |
Merge branch 'ldap_nickname' into 'master'
Remove omniauth-ldap nickname bug workaround
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/user.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb index 456a61b9e43..6bc587df3ce 100644 --- a/lib/gitlab/ldap/user.rb +++ b/lib/gitlab/ldap/user.rb @@ -86,11 +86,7 @@ module Gitlab end def username - (auth.info.nickname || samaccountname).to_s.force_encoding("utf-8") - end - - def samaccountname - (auth.extra[:raw_info][:samaccountname] || []).first + auth.info.nickname.to_s.force_encoding("utf-8") end def provider |