diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-10 15:11:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-10 15:11:00 +0000 |
| commit | ad2d90fb2475c9660b04951cd93ee969cf78c09b (patch) | |
| tree | e416d05f5fc0043b1b3c04837e22b2890886e9a6 /app/controllers/confirmations_controller.rb | |
| parent | 5103041796d8b3cfcfc5fdb010ebc6a3bb814df1 (diff) | |
| download | gitlab-ce-ad2d90fb2475c9660b04951cd93ee969cf78c09b.tar.gz | |
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 4d1cbd8becc..e94138c4d9b 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -20,7 +20,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 unless Gitlab::CurrentSettings.email_confirmation_setting_soft? stored_location_for(resource) || dashboard_projects_path end |