Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
7425f2b3
Commit
7425f2b3
authored
Apr 23, 2018
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport IdentityLinker#failed? from GroupSaml callback flow
parent
4bf47cd7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/controllers/omniauth_callbacks_controller.rb
app/controllers/omniauth_callbacks_controller.rb
+1
-1
lib/gitlab/auth/omniauth_identity_linker_base.rb
lib/gitlab/auth/omniauth_identity_linker_base.rb
+4
-0
No files found.
app/controllers/omniauth_callbacks_controller.rb
View file @
7425f2b3
...
...
@@ -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
...
...
lib/gitlab/auth/omniauth_identity_linker_base.rb
View file @
7425f2b3
...
...
@@ -17,6 +17,10 @@ module Gitlab
@changed
end
def
failed?
error_message
.
present?
end
def
error_message
identity
.
validate
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment