b7dfe2ae40
Add latest changes from gitlab-org/gitlab@master
2019-09-13 13:26:31 +00:00
a0bbfa9fc3
Don't redirect to the Almost there page
...
Don't redirect to the Almost there page after registration
and after resending confirmation instructions
2019-08-08 13:58:20 +02:00
76e8960f4a
Externalize strings in flash messages
...
- Externalize strings in controllers
- Update PO file
2019-04-08 14:17:45 +00:00
73322a0e55
Enable frozen string in app/controllers/**/*.rb
...
Enables frozen string for the following:
* app/controllers/*.rb
* app/controllers/admin/**/*.rb
* app/controllers/boards/**/*.rb
* app/controllers/ci/**/*.rb
* app/controllers/concerns/**/*.rb
Partially addresses #47424 .
2018-09-18 21:22:45 -07:00
01275667e3
Resolve "Opening Project with invite but without accepting leads to 404 error page"
2018-05-17 09:19:47 +00:00
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
a2894b7ad2
use a delegate for `username` to be more future friendly
2017-10-27 16:32:48 +02:00
196df26446
fix to pass static-analysis
2017-10-24 09:23:35 +03:00
57a275791f
grab the correct username when confirming secondary email
2017-10-23 19:04:57 +03:00
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
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
ed3c25e429
spacing and small optimisations
2017-10-01 17:07:26 +02:00
4a6ec7c947
refactor some controllers to make them EE friendly
2017-09-28 08:46:39 +02:00
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
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
52867e15ac
Disable automatic login feature when clicking on email confirmation links
2016-12-31 10:58:08 -05:00
9e211091a8
Enable Style/EmptyLines cop, remove redundant ones
2016-07-01 21:56:17 +02:00
50ed43e490
Improved confirmation UX
...
Closes #4228
2016-04-21 20:20:09 -04:00
39f389ae0f
Add invites controller.
2015-04-14 12:07:33 +02:00
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
GitLab Bot