Commit e6fbf79bc51c6a466d7fa880adb598cded41707a
Exists in
spb-stable
and in
3 other branches
Merge branch 'ldap_nickname' into 'master'
Remove omniauth-ldap nickname bug workaround
Showing
2 changed files
with
2 additions
and
5 deletions
Show diff stats
CHANGELOG
| @@ -2,6 +2,7 @@ v 6.8.0 | @@ -2,6 +2,7 @@ v 6.8.0 | ||
| 2 | - Ability to at mention users that are participating in issue and merge req. discussion | 2 | - Ability to at mention users that are participating in issue and merge req. discussion |
| 3 | - Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu) | 3 | - Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu) |
| 4 | - Make user search case-insensitive (Christopher Arnold) | 4 | - Make user search case-insensitive (Christopher Arnold) |
| 5 | + - Remove omniauth-ldap nickname bug workaround | ||
| 5 | 6 | ||
| 6 | v 6.7.2 | 7 | v 6.7.2 |
| 7 | - Fix upgrader script | 8 | - Fix upgrader script |
lib/gitlab/ldap/user.rb
| @@ -86,11 +86,7 @@ module Gitlab | @@ -86,11 +86,7 @@ module Gitlab | ||
| 86 | end | 86 | end |
| 87 | 87 | ||
| 88 | def username | 88 | def username |
| 89 | - (auth.info.nickname || samaccountname).to_s.force_encoding("utf-8") | ||
| 90 | - end | ||
| 91 | - | ||
| 92 | - def samaccountname | ||
| 93 | - (auth.extra[:raw_info][:samaccountname] || []).first | 89 | + auth.info.nickname.to_s.force_encoding("utf-8") |
| 94 | end | 90 | end |
| 95 | 91 | ||
| 96 | def provider | 92 | def provider |