From c7297cfa49d543ffc590cf2d5ccec345791af78b Mon Sep 17 00:00:00 2001 From: andreas-unleash Date: Tue, 19 Dec 2023 13:59:14 +0200 Subject: [PATCH] fix: conflict email naming bug - cleanup files Signed-off-by: andreas-unleash --- .../scheduled-change-conflict.html | 527 ------------------ .../scheduled-change-conflict.html.mustache | 0 .../scheduled-change-conflict.plain.mustache | 0 .../scheduled-execution-failed.html | 522 ----------------- 4 files changed, 1049 deletions(-) delete mode 100644 src/mailtemplates/schedule-change-conflict/scheduled-change-conflict.html rename src/mailtemplates/{schedule-change-conflict => scheduled-change-conflict}/scheduled-change-conflict.html.mustache (100%) rename src/mailtemplates/{schedule-change-conflict => scheduled-change-conflict}/scheduled-change-conflict.plain.mustache (100%) delete mode 100644 src/mailtemplates/scheduled-execution-failed/scheduled-execution-failed.html diff --git a/src/mailtemplates/schedule-change-conflict/scheduled-change-conflict.html b/src/mailtemplates/schedule-change-conflict/scheduled-change-conflict.html deleted file mode 100644 index dbc58b2807c2..000000000000 --- a/src/mailtemplates/schedule-change-conflict/scheduled-change-conflict.html +++ /dev/null @@ -1,527 +0,0 @@ - - - - - *|MC:SUBJECT|* - - - -
- - - - -
- - - - - - - - - - - - - - -
- - - - - - - - -
- Scheduled changes can no longer be applied - - Email not displaying correctly?
View it in your browser. -
- -
- - - - - -
- -
- -
- - - - - -
-

Conflict detected in a scheduled change

- -
- {{ conflict }}. Scheduled change requests that use this {{ conflictScope }} can no longer be applied and their scheduled applications will fail{{#conflictResolution}}{{.}}{{/conflictResolution}}{{^conflictResolution}}.{{/conflictResolution}} -
- For you, this concerns change requests: -
- {{#changeRequests}} - - {{/changeRequests}} -
- -
- - - - - - - - - -
- Follow us on Github -
- Copyright © {{ year }} | Bricks Software | All rights reserved. -
- -
- Our mailing address is: team@getunleash.io -
- -
- -
- -
-
- - diff --git a/src/mailtemplates/schedule-change-conflict/scheduled-change-conflict.html.mustache b/src/mailtemplates/scheduled-change-conflict/scheduled-change-conflict.html.mustache similarity index 100% rename from src/mailtemplates/schedule-change-conflict/scheduled-change-conflict.html.mustache rename to src/mailtemplates/scheduled-change-conflict/scheduled-change-conflict.html.mustache diff --git a/src/mailtemplates/schedule-change-conflict/scheduled-change-conflict.plain.mustache b/src/mailtemplates/scheduled-change-conflict/scheduled-change-conflict.plain.mustache similarity index 100% rename from src/mailtemplates/schedule-change-conflict/scheduled-change-conflict.plain.mustache rename to src/mailtemplates/scheduled-change-conflict/scheduled-change-conflict.plain.mustache diff --git a/src/mailtemplates/scheduled-execution-failed/scheduled-execution-failed.html b/src/mailtemplates/scheduled-execution-failed/scheduled-execution-failed.html deleted file mode 100644 index acab22bd2223..000000000000 --- a/src/mailtemplates/scheduled-execution-failed/scheduled-execution-failed.html +++ /dev/null @@ -1,522 +0,0 @@ - - - - - *|MC:SUBJECT|* - - - -
- - - - -
- - - - - - - - - - - - - - -
- - - - - - - - -
- Scheduled change request failed to apply - - Email not displaying correctly?
View it in your browser. -
- -
- - - - - -
- -
- -
- - - - - -
-

Scheduled change request failed to apply

- -
- Scheduled change request {{{ changeRequestTitle }}} failed to apply at {{{ scheduledAt }}} due to {{{ errorMessage }}}. -
- You can reschedule the change request to try again later or reject the changes to close it. -
-
- -
- - - - - - - - - -
- Follow us on Github -
- Copyright © {{ year }} | Bricks Software | All rights reserved. -
- -
- Our mailing address is: team@getunleash.io -
- -
- -
- -
-
- -