diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 12:08:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 12:08:43 +0300 |
| commit | 26384c9a61da9922b8fa4b8351d4e42d51661b37 (patch) | |
| tree | ef3decbed644db3c97dcdbb5b71d4ade77f3155d /app/controllers/confirmations_controller.rb | |
| parent | 79cbe31b18159ea394c6f6e3027c1dc69bdabb75 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/confirmations_controller.rb')
| -rw-r--r-- | app/controllers/confirmations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index 21ee76d31b2..f99345fa99d 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -11,7 +11,7 @@ class ConfirmationsController < Devise::ConfirmationsController protected def after_resending_confirmation_instructions_path_for(resource) - Feature.enabled?(:soft_email_confirmation) ? stored_location_for(resource) || dashboard_projects_path : users_almost_there_path + stored_location_for(resource) || dashboard_projects_path end def after_confirmation_path_for(resource_name, resource) |