Commit 196df264 authored by Brett Walker's avatar Brett Walker

fix to pass static-analysis

parent 57a27579
...@@ -10,12 +10,12 @@ class ConfirmationsController < Devise::ConfirmationsController ...@@ -10,12 +10,12 @@ class ConfirmationsController < Devise::ConfirmationsController
users_almost_there_path users_almost_there_path
end end
def after_confirmation_path_for(_resource_name, resource) def after_confirmation_path_for(resource_name, resource)
# incoming resource can either be a :user or an :email # incoming resource can either be a :user or an :email
if signed_in?(:user) if signed_in?(:user)
after_sign_in(resource) after_sign_in(resource)
else else
username = (_resource_name == :email ? resource.user.username : resource.username) username = (resource_name == :email ? resource.user.username : resource.username)
Gitlab::AppLogger.info("Email Confirmed: username=#{username} email=#{resource.email} ip=#{request.remote_ip}") Gitlab::AppLogger.info("Email Confirmed: username=#{username} email=#{resource.email} ip=#{request.remote_ip}")
flash[:notice] += " Please sign in." flash[:notice] += " Please sign in."
new_session_path(:user) new_session_path(:user)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment