diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 03:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 03:09:34 +0300 |
| commit | 5781a4966047232d4725f9ee4769c4bd5aed9b26 (patch) | |
| tree | 0ef2b81a40931ec51f8fdd5284ed9e47cf42a923 /app/controllers/confirmations_controller.rb | |
| parent | 4d48b3cfcd74bcca0f0f305746f74cf7224dd78b (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, 2 insertions, 0 deletions
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index f99345fa99d..a27c4027380 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -11,6 +11,8 @@ class ConfirmationsController < Devise::ConfirmationsController protected def after_resending_confirmation_instructions_path_for(resource) + return users_almost_there_path unless Feature.enabled?(:soft_email_confirmation) + stored_location_for(resource) || dashboard_projects_path end |