0c0c2ecd99
# Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb
27 lines
739 B
Ruby
27 lines
739 B
Ruby
class ConfirmationsController < Devise::ConfirmationsController
|
|
def almost_there
|
|
flash[:notice] = nil
|
|
render layout: "devise_empty"
|
|
end
|
|
|
|
protected
|
|
|
|
def after_resending_confirmation_instructions_path_for(resource)
|
|
users_almost_there_path
|
|
end
|
|
|
|
def after_confirmation_path_for(_resource_name, resource)
|
|
# incoming resource can either be a :user or an :email
|
|
if signed_in?(:user)
|
|
after_sign_in(resource)
|
|
else
|
|
Gitlab::AppLogger.info("Email Confirmed: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip}")
|
|
flash[:notice] += " Please sign in."
|
|
new_session_path(:user)
|
|
end
|
|
end
|
|
|
|
def after_sign_in(resource)
|
|
after_sign_in_path_for(resource)
|
|
end
|
|
end
|