diff options
Diffstat (limited to 'app/controllers/confirmations_controller.rb')
| -rw-r--r-- | app/controllers/confirmations_controller.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index 6dd4d72bbc7..e94138c4d9b 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -10,7 +10,7 @@ class ConfirmationsController < Devise::ConfirmationsController prepend_before_action :check_recaptcha, only: :create before_action :load_recaptcha, only: :new - feature_category :authentication_and_authorization + feature_category :user_management def almost_there flash[:notice] = nil @@ -20,12 +20,12 @@ 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 - def after_confirmation_path_for(resource_name, resource) + def after_confirmation_path_for(_resource_name, resource) accept_pending_invitations # incoming resource can either be a :user or an :email @@ -34,10 +34,14 @@ class ConfirmationsController < Devise::ConfirmationsController else Gitlab::AppLogger.info("Email Confirmed: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip}") flash[:notice] = flash[:notice] + _(" Please sign in.") - new_session_path(:user, anchor: 'login-pane', invite_email: resource.email) + sign_in_path(resource) end end + def sign_in_path(user) + new_session_path(:user, anchor: 'login-pane', invite_email: resource.email) + end + def check_recaptcha return unless resource_params[:email].present? |