diff options
author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-10-05 11:53:54 +0100 |
---|---|---|
committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-10-05 11:53:54 +0100 |
commit | 4e2ddad2bbced50d71d4d2613db5e9af6a7188c9 (patch) | |
tree | 864923b6fe83d6a0551700c5c9c074a1b4f790c4 /lib/gitlab/o_auth | |
parent | d55216c092fc3d70fc413f74c2f5353fa45bd75a (diff) | |
download | gitlab-ce-4e2ddad2bbced50d71d4d2613db5e9af6a7188c9.tar.gz |
Only add identities to a user if we find one in Gitlab::OAuth::User.38801-add-or-update-identities-should-only-work-if-gl-user-exists
Diffstat (limited to 'lib/gitlab/o_auth')
-rw-r--r-- | lib/gitlab/o_auth/user.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb index 68815be4d13..47c2a422387 100644 --- a/lib/gitlab/o_auth/user.rb +++ b/lib/gitlab/o_auth/user.rb @@ -64,6 +64,8 @@ module Gitlab protected def add_or_update_user_identities + return unless gl_user + # find_or_initialize_by doesn't update `gl_user.identities`, and isn't autosaved. identity = gl_user.identities.find { |identity| identity.provider == auth_hash.provider } |