Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 3 insertions, 2 deletions

diff --git a/app/mailers/emails/profile.rb b/app/mailers/emails/profile.rb
index ede6007e0e2..5b1750400d8 100644
--- a/app/mailers/emails/profile.rb
+++ b/app/mailers/emails/profile.rb
@@ -83,14 +83,15 @@ module Emails
       end
     end
 
-    def access_token_expired_email(user)
+    def access_token_expired_email(user, token_names = [])
       return unless user && user.active?
 
       @user = user
+      @token_names = token_names
       @target_url = profile_personal_access_tokens_url
 
       Gitlab::I18n.with_locale(@user.preferred_language) do
-        mail_with_locale(to: @user.notification_email_or_default, subject: subject(_("Your personal access token has expired")))
+        mail_with_locale(to: @user.notification_email_or_default, subject: subject(_("Your personal access tokens have expired")))
       end
     end