diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-23 00:05:12 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-05-04 15:00:59 +0100 |
| commit | 7425f2b32217f71f99ff8642664a6642dfaeff87 (patch) | |
| tree | a81aaf750854d72d1c1c446a52c1b70392300308 /app/controllers | |
| parent | 4bf47cd76fd69a26b7b2b4ac029f088ec5493712 (diff) | |
| download | gitlab-ce-7425f2b32217f71f99ff8642664a6642dfaeff87.tar.gz | |
Backport IdentityLinker#failed? from GroupSaml callback flow
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 40d9fa18a10..ed89bed029b 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -82,7 +82,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController if identity_linker.changed? redirect_identity_linked - elsif identity_linker.error_message.present? + elsif identity_linker.failed? redirect_identity_link_failed(identity_linker.error_message) else redirect_identity_exists |