Add latest changes from gitlab-org/security/gitlab@15-9-stable-ee

1 files changed, 3 insertions, 11 deletions

diff --git a/app/controllers/concerns/confirm_email_warning.rb b/app/controllers/concerns/confirm_email_warning.rb
index 2711c823275..ec5140bf223 100644
--- a/app/controllers/concerns/confirm_email_warning.rb
+++ b/app/controllers/concerns/confirm_email_warning.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module ConfirmEmailWarning
-  include Gitlab::Utils::StrongMemoize
   extend ActiveSupport::Concern
 
   included do
@@ -18,9 +17,11 @@ module ConfirmEmailWarning
     return unless current_user
     return if current_user.confirmed?
 
+    email = current_user.unconfirmed_email || current_user.email
+
     flash.now[:warning] = format(
       confirm_warning_message,
-      email: email_to_display,
+      email: email,
       resend_link: view_context.link_to(_('Resend it'), user_confirmation_path(user: { email: email }), method: :post),
       update_link: view_context.link_to(_('Update it'), profile_path)
     ).html_safe
@@ -28,16 +29,7 @@ module ConfirmEmailWarning
 
   private
 
-  def email
-    current_user.unconfirmed_email || current_user.email
-  end
-  strong_memoize_attr :email
-
   def confirm_warning_message
     _("Please check your email (%{email}) to verify that you own this address and unlock the power of CI/CD. Didn't receive it? %{resend_link}. Wrong email address? %{update_link}.")
   end
-
-  def email_to_display
-    html_escape(email)
-  end
 end