summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAlex Buijs <abuijs@gitlab.com>2019-07-31 16:49:52 +0200
committerAlex Buijs <abuijs@gitlab.com>2019-08-08 13:58:20 +0200
commita0bbfa9fc3da98f9dfa3a626a9dcd9816b88e5ed (patch)
treeb85bacb7e01e69fa7f633adcf8abbd4779913e52 /app
parent5cbe16c3d2a3a3667021fb8c81f743308aefbdae (diff)
downloadgitlab-ce-a0bbfa9fc3da98f9dfa3a626a9dcd9816b88e5ed.tar.gz
Don't redirect to the Almost there page
Don't redirect to the Almost there page after registration and after resending confirmation instructions
Diffstat (limited to 'app')
-rw-r--r--app/controllers/confirmations_controller.rb2
-rw-r--r--app/controllers/registrations_controller.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index 2ae500a2fdf..b192189ba3c 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)
- users_almost_there_path
+ Feature.enabled?(:soft_email_confirmation) ? stored_location_for(resource) || dashboard_projects_path : users_almost_there_path
end
def after_confirmation_path_for(resource_name, resource)
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 638934694e0..1099773c904 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -68,12 +68,12 @@ class RegistrationsController < Devise::RegistrationsController
def after_sign_up_path_for(user)
Gitlab::AppLogger.info(user_created_message(confirmed: user.confirmed?))
- user.confirmed? ? stored_location_for(user) || dashboard_projects_path : users_almost_there_path
+ user.confirmed? || Feature.enabled?(:soft_email_confirmation) ? stored_location_for(user) || dashboard_projects_path : users_almost_there_path
end
def after_inactive_sign_up_path_for(resource)
Gitlab::AppLogger.info(user_created_message)
- users_almost_there_path
+ Feature.enabled?(:soft_email_confirmation) ? dashboard_projects_path : users_almost_there_path
end
private