summaryrefslogtreecommitdiff
path: root/app/controllers/confirmations_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "Opening Project with invite but without accepting leads to 404 ↵🙈 jacopo beschi 🙉2018-05-171-0/+4
| | | | error page"
* Fix Shows signin tab after new user email confirmationJacopo2018-01-181-1/+1
| | | | When a new user confirm his email the signin tab is correctly shown.
* use a delegate for `username` to be more future friendlyBrett Walker2017-10-271-2/+1
|
* fix to pass static-analysisBrett Walker2017-10-241-2/+2
|
* grab the correct username when confirming secondary emailBrett Walker2017-10-231-1/+2
|
* Merge branch 'master' into ↵Douwe Maan2017-10-051-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'enhance-logging' into 'master'Robert Speicher2017-10-021-0/+1
| |\ | | | | | | | | | | | | Improved file logging for authentication events See merge request gitlab-org/gitlab-ce!9196
| | * # This is a combination of 1 commit.Brian Neel2017-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | refactor some controllers to make them EE friendlyJames Lopez2017-09-281-1/+5
| |/
* | spacing and small optimisationsAlexandra2017-10-011-1/+1
| |
* | Send a confirmation email when the user adds a secondary email address. ↵Brett Walker2017-09-231-2/+3
|/ | | | Utilizes the Devise `confirmable` capabilities. Issue #37385
* Disable automatic login feature when clicking on email confirmation linksdisable-automatic-login-on-email-confirmationBrian Neel2016-12-311-6/+2
|
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-1/+0
|
* Improved confirmation UXconfirmation-screenPhil Hughes2016-04-211-0/+9
| | | | Closes #4228
* Add invites controller.Douwe Maan2015-04-141-2/+2
|
* Try signing in the user after user confirmation is correct and redirect to ↵Marin Jankovski2014-10-021-0/+17
dashboard, otherwise redirect to signin page
View Lorry Controller Status