gitlab-org--gitlab-foss/app/controllers/confirmations_controller.rb
Robert Speicher 4d5ea927d6 Merge branch 'enhance-logging' into 'master'
Improved file logging for authentication events

See merge request gitlab-org/gitlab-ce!9196
2017-10-02 18:10:01 +00:00

26 lines
695 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)
if signed_in?(resource_name)
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(resource_name)
end
end
def after_sign_in(resource)
after_sign_in_path_for(resource)
end
end