Commit graph

15 commits

Author SHA1 Message Date
Jacopo
269594bf22 Fix Shows signin tab after new user email confirmation
When a new user confirm his email the signin tab is correctly shown.
2018-01-18 14:32:44 +01:00
Brett Walker
a2894b7ad2 use a delegate for username to be more future friendly 2017-10-27 16:32:48 +02:00
Brett Walker
196df26446 fix to pass static-analysis 2017-10-24 09:23:35 +03:00
Brett Walker
57a275791f grab the correct username when confirming secondary email 2017-10-23 19:04:57 +03:00
Douwe Maan
0c0c2ecd99 Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
# Conflicts:
#	app/controllers/admin/users_controller.rb
#	app/controllers/confirmations_controller.rb
#	app/controllers/profiles/emails_controller.rb
#	app/models/user.rb
#	app/services/emails/base_service.rb
#	app/services/emails/destroy_service.rb
#	app/views/devise/mailer/confirmation_instructions.html.haml
#	lib/api/users.rb
#	spec/services/emails/destroy_service_spec.rb
2017-10-05 12:48:22 +02:00
Robert Speicher
4d5ea927d6 Merge branch 'enhance-logging' into 'master'
Improved file logging for authentication events

See merge request gitlab-org/gitlab-ce!9196
2017-10-02 18:10:01 +00:00
Alexandra
ed3c25e429 spacing and small optimisations 2017-10-01 17:07:26 +02:00
James Lopez
4a6ec7c947 refactor some controllers to make them EE friendly 2017-09-28 08:46:39 +02:00
Brian Neel
8fa87ea3fb # This is a combination of 1 commit.
# This is the 1st commit message:
Add logging for all web authentication events

# This is the commit message #2:

Re-add underscore to after_inactive_sign_up_path_for

# This is the commit message #3:

Standardize on username=

# This is the commit message #4:

after_filter -> after_action, _resource -> resource

# This is the commit message #5:

Add two-factor login failures and account lockouts

# This is the commit message #6:

Move logging from two-factor concern to user model

# This is the commit message #7:

Add spaces around default parameter assignments

# This is the commit message #8:

Move logs out of user model

# This is the commit message #9:

Replace filtered_params with user_params

# This is the commit message #10:

Standardize case

# This is the commit message #1:

Fixes for username and AppLogger.info
2017-09-27 21:52:12 -04:00
Brett Walker
f9f4672275 Send a confirmation email when the user adds a secondary email address. Utilizes the Devise confirmable capabilities. Issue #37385 2017-09-23 15:23:11 +02:00
Brian Neel
52867e15ac Disable automatic login feature when clicking on email confirmation links 2016-12-31 10:58:08 -05:00
Grzegorz Bizon
9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
Phil Hughes
50ed43e490 Improved confirmation UX
Closes #4228
2016-04-21 20:20:09 -04:00
Douwe Maan
39f389ae0f Add invites controller. 2015-04-14 12:07:33 +02:00
Marin Jankovski
30c447ed2f Try signing in the user after user confirmation is correct and redirect to dashboard, otherwise redirect to signin page 2014-10-02 14:38:26 +02:00