diff options
Diffstat (limited to 'app/controllers/registrations_controller.rb')
| -rw-r--r-- | app/controllers/registrations_controller.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 11f9f1cf0c6..0800d635d92 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class RegistrationsController < Devise::RegistrationsController - include Recaptcha::Verify + include Recaptcha::Adapters::ControllerMethods include AcceptsPendingInvitations include RecaptchaHelper include InvisibleCaptchaOnSignup @@ -121,7 +121,7 @@ class RegistrationsController < Devise::RegistrationsController def after_sign_up_path_for(user) Gitlab::AppLogger.info(user_created_message(confirmed: user.confirmed?)) - users_sign_up_welcome_path(glm_tracking_params) + after_sign_up_path end def after_inactive_sign_up_path_for(resource) @@ -131,7 +131,7 @@ class RegistrationsController < Devise::RegistrationsController # when email confirmation is enabled, path to redirect is saved # after user confirms and comes back, he will be redirected - store_location_for(:redirect, users_sign_up_welcome_path(glm_tracking_params)) + store_location_for(:redirect, after_sign_up_path) return identity_verification_redirect_path if custom_confirmation_enabled? @@ -141,6 +141,10 @@ class RegistrationsController < Devise::RegistrationsController private + def after_sign_up_path + users_sign_up_welcome_path(glm_tracking_params) + end + def ensure_destroy_prerequisites_met if current_user.solo_owned_groups.present? redirect_to profile_account_path, |