Commit e6fbf79b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'ldap_nickname' into 'master'

Remove omniauth-ldap nickname bug workaround
parents 4af38885 2e6b5370
......@@ -2,6 +2,7 @@ v 6.8.0
- Ability to at mention users that are participating in issue and merge req. discussion
- 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)
- Make user search case-insensitive (Christopher Arnold)
- Remove omniauth-ldap nickname bug workaround
v 6.7.2
- Fix upgrader script
......
......@@ -86,11 +86,7 @@ def find_by_uid(uid)
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment