diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /app/controllers/confirmations_controller.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/controllers/confirmations_controller.rb')
-rw-r--r-- | app/controllers/confirmations_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index e82500912fa..560369a8de4 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -13,7 +13,7 @@ class ConfirmationsController < Devise::ConfirmationsController protected def after_resending_confirmation_instructions_path_for(resource) - return users_almost_there_path unless Feature.enabled?(:soft_email_confirmation) + return users_almost_there_path(email: resource.email) unless Feature.enabled?(:soft_email_confirmation) stored_location_for(resource) || dashboard_projects_path end @@ -34,6 +34,10 @@ class ConfirmationsController < Devise::ConfirmationsController def after_sign_in(resource) after_sign_in_path_for(resource) end + + def context_user + resource + end end ConfirmationsController.prepend_mod_with('ConfirmationsController') |