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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5fa10409
Commit
5fa10409
authored
Aug 07, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/audit-events-failed-login-2' into 'master'
Refactor omniauth controller code See merge request !2619
parents
d262f2b5
ad89850e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
10 deletions
+2
-10
ee/app/controllers/ee/omniauth_callbacks_controller.rb
ee/app/controllers/ee/omniauth_callbacks_controller.rb
+2
-10
No files found.
ee/app/controllers/ee/omniauth_callbacks_controller.rb
View file @
5fa10409
...
...
@@ -5,18 +5,10 @@ module EE
def
fail_login
log_failed_login
(
@user
.
username
,
oauth
[
'provider'
])
error_message
=
@user
.
errors
.
full_messages
.
to_sentence
return
redirect_to
omniauth_error_path
(
oauth
[
'provider'
],
error:
error_message
)
super
end
def
fail_ldap_login
log_failed_login
(
@user
.
username
,
oauth
[
'provider'
])
flash
[
:alert
]
=
'Access denied for your LDAP account.'
redirect_to
new_user_session_path
end
alias_method
:fail_ldap_login
,
:fail_login
private
...
...
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