Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2017-10-24 09:23:35 +0300
committerBrett Walker <bwalker@gitlab.com>2017-10-24 09:23:35 +0300
commit196df264467c2332fbeed1ff350ef176e92d0fd6 (patch)
treeebac75e90fd98c10d7acb0de620f589d78845261 /app/controllers/confirmations_controller.rb
parent57a275791ff0e263dbe07ba7f1bfc4fdf53842cf (diff)
fix to pass static-analysis
Diffstat (limited to 'app/controllers/confirmations_controller.rb')
-rw-r--r--app/controllers/confirmations_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index 43b5d557429..8ca01a6e2c6 100644
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -10,12 +10,12 @@ class ConfirmationsController < Devise::ConfirmationsController
users_almost_there_path
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
if signed_in?(:user)
after_sign_in(resource)
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}")
flash[:notice] += " Please sign in."
new_session_path(:user)