diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 14:33:18 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 14:33:18 +0000 |
commit | a5d258e233528bee345306e5ffd4c6c681d343b8 (patch) | |
tree | 126caa28e4610fc092388309bb686b171bbb934d /lib | |
parent | 63bbe42c9cc5c23e090849022df60b2e45ee35d5 (diff) | |
parent | e82b37a6537eb86366fbd1506b6dd371b7afe051 (diff) | |
download | gitlab-ce-a5d258e233528bee345306e5ffd4c6c681d343b8.tar.gz |
Merge branch 'fix-work-with-multibyte-chars-in-ldap-uid' into 'master'
Add support of multibyte characters in LDAP UID
See merge request !1472
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ldap/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb index cb66fd500fe..1ea7751e27d 100644 --- a/lib/gitlab/ldap/user.rb +++ b/lib/gitlab/ldap/user.rb @@ -14,7 +14,7 @@ module Gitlab # LDAP distinguished name is case-insensitive identity = ::Identity. where(provider: provider). - where('lower(extern_uid) = ?', uid.downcase).last + where('lower(extern_uid) = ?', uid.mb_chars.downcase.to_s).last identity && identity.user end end |