From d9ed9cebb3eed7ff51c70a68a37dbb9202093b73 Mon Sep 17 00:00:00 2001 From: Ian Littman Date: Mon, 9 Dec 2024 09:31:25 -0600 Subject: [PATCH] Cherry-Pick: Add "do not reply to this automated message" copy to remaining emails, fix X logo location, swap Twitter for X on other automated email templates (#24528) For consistency with new MFA email in #22078. Merged into `main` via #24506. --- changes/22078-do-not-reply | 1 + changes/22078-x | 1 + .../mail/templates/change_email_confirmation.html | 9 ++++++--- server/mail/templates/invite_token.html | 4 ++++ server/mail/templates/password_reset.html | 9 ++++++--- server/mail/templates/smtp_setup.html | 9 ++++++--- .../assets/images/permanent}/x-logo-24x24@2x.png | Bin 7 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 changes/22078-do-not-reply create mode 100644 changes/22078-x rename {assets/images => website/assets/images/permanent}/x-logo-24x24@2x.png (100%) diff --git a/changes/22078-do-not-reply b/changes/22078-do-not-reply new file mode 100644 index 000000000000..aa9f8253afc9 --- /dev/null +++ b/changes/22078-do-not-reply @@ -0,0 +1 @@ +* Add language in email templates indicating that users should not reply to the automated emails \ No newline at end of file diff --git a/changes/22078-x b/changes/22078-x new file mode 100644 index 000000000000..d6fb5d404980 --- /dev/null +++ b/changes/22078-x @@ -0,0 +1 @@ +* Switch Twitter logo to X logo in Fleet-initiated automated emails \ No newline at end of file diff --git a/server/mail/templates/change_email_confirmation.html b/server/mail/templates/change_email_confirmation.html index 7c0e5c936bfb..d308cd1f2c55 100644 --- a/server/mail/templates/change_email_confirmation.html +++ b/server/mail/templates/change_email_confirmation.html @@ -131,6 +131,9 @@

Confirm your updated email address

> Confirm email +

+ Please do not reply to this automated message. +

Confirm your updated email address Twitter logo You have been invited to Fleet! {{end}} +

+ Please do not reply to this automated message. +

+
diff --git a/server/mail/templates/password_reset.html b/server/mail/templates/password_reset.html index f8f701df91c0..b093b8f9f7b0 100644 --- a/server/mail/templates/password_reset.html +++ b/server/mail/templates/password_reset.html @@ -137,6 +137,9 @@

Reset your Fleet password

If you did not make the request, you may ignore this email as no changes have been made.

+

+ Please do not reply to this automated message. +

@@ -150,9 +153,9 @@

Reset your Fleet password

Twitter logo

Fleet SMTP setup confirmed

This message confirms that SMTP is set up properly on your Fleet instance.

+

+ Please do not reply to this automated message. +

Twitter logo