From 57a275791ff0e263dbe07ba7f1bfc4fdf53842cf Mon Sep 17 00:00:00 2001 From: Brett Walker Date: Mon, 23 Oct 2017 19:04:57 +0300 Subject: [PATCH] grab the correct username when confirming secondary email --- app/controllers/confirmations_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index 80ab681ed87..43b5d557429 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -15,7 +15,8 @@ class ConfirmationsController < Devise::ConfirmationsController if signed_in?(:user) after_sign_in(resource) else - Gitlab::AppLogger.info("Email Confirmed: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip}") + 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) end -- GitLab