diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
| commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
| tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /lib/gitlab/auth/o_auth/user.rb | |
| parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) | |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'lib/gitlab/auth/o_auth/user.rb')
| -rw-r--r-- | lib/gitlab/auth/o_auth/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb index 3981594478d..d70c788dac8 100644 --- a/lib/gitlab/auth/o_auth/user.rb +++ b/lib/gitlab/auth/o_auth/user.rb @@ -225,7 +225,7 @@ module Gitlab if creating_linked_ldap_user? username = ldap_person.username.presence name = ldap_person.name.presence - email = ldap_person.email.first.presence + email = ldap_person.email&.first.presence end username ||= auth_hash.username @@ -272,7 +272,7 @@ module Gitlab if creating_linked_ldap_user? metadata.set_attribute_synced(:name, true) if gl_user.name == ldap_person.name - metadata.set_attribute_synced(:email, true) if gl_user.email == ldap_person.email.first + metadata.set_attribute_synced(:email, true) if gl_user.email == ldap_person.email&.first metadata.provider = ldap_person.provider end end |