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 /lib | |
| parent | 4bf47cd76fd69a26b7b2b4ac029f088ec5493712 (diff) | |
| download | gitlab-ce-7425f2b32217f71f99ff8642664a6642dfaeff87.tar.gz | |
Backport IdentityLinker#failed? from GroupSaml callback flow
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/auth/omniauth_identity_linker_base.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/auth/omniauth_identity_linker_base.rb b/lib/gitlab/auth/omniauth_identity_linker_base.rb index ae365fcdfaa..f79ce6bb809 100644 --- a/lib/gitlab/auth/omniauth_identity_linker_base.rb +++ b/lib/gitlab/auth/omniauth_identity_linker_base.rb @@ -17,6 +17,10 @@ module Gitlab @changed end + def failed? + error_message.present? + end + def error_message identity.validate |