diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-23 11:56:44 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-23 13:53:32 +0100 |
| commit | d3a8a07423dccf1709b6432e017ae4679143dbce (patch) | |
| tree | 0555fa8871e274eee93d38cd7bbbd79a5718142d /app/controllers/omniauth_callbacks_controller.rb | |
| parent | f8d54913bb6f846d1204704d3a6e457956461b35 (diff) | |
| download | gitlab-ce-d3a8a07423dccf1709b6432e017ae4679143dbce.tar.gz | |
Unify Saml::IdentityLinker and OAuth::IdentityLinker
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index df75693e840..f7e7f04384a 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -80,9 +80,9 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController identity_linker ||= auth_module::IdentityLinker.new(current_user, oauth) - identity_linker.create_or_update + identity_linker.link - if identity_linker.created? + if identity_linker.changed? redirect_identity_linked elsif identity_linker.error_message.present? redirect_identity_link_failed(identity_linker.error_message) |