diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-03-21 10:10:44 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-03-21 10:10:44 +0000 |
| commit | d141b87496283496e2f2a04c544f32456c6d263f (patch) | |
| tree | 3b3d6033b088ccdeea3e938f1e8900ab7ee0d827 /lib | |
| parent | 1efa960444a2a09bfb8d18c696f23aa281ad7fb3 (diff) | |
| parent | 8018bc96a3c836682d2a4ad1dff775d04e359dec (diff) | |
| download | gitlab-ce-d141b87496283496e2f2a04c544f32456c6d263f.tar.gz | |
Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master'
Handle nil name in Gitlab::Auth::LDAP::Person#name
See merge request gitlab-org/gitlab-ce!26364
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/auth/ldap/person.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth/ldap/person.rb b/lib/gitlab/auth/ldap/person.rb index 13d67e0f871..c1517222956 100644 --- a/lib/gitlab/auth/ldap/person.rb +++ b/lib/gitlab/auth/ldap/person.rb @@ -69,7 +69,7 @@ module Gitlab end def name - attribute_value(:name).first + attribute_value(:name)&.first end def uid |