diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-14 12:07:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-14 12:07:42 +0000 |
| commit | cacc3815006ab7d3828ebe8903f95154b27a6e21 (patch) | |
| tree | 5adc693664d1ca383d19f8f165b37eea2318387f /app/mailers | |
| parent | ce684df4733d86a49126792721f549612a778590 (diff) | |
| download | gitlab-ce-cacc3815006ab7d3828ebe8903f95154b27a6e21.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/service_desk.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/mailers/emails/service_desk.rb b/app/mailers/emails/service_desk.rb index 835abacbed5..1295f978049 100644 --- a/app/mailers/emails/service_desk.rb +++ b/app/mailers/emails/service_desk.rb @@ -101,6 +101,10 @@ module Emails .gsub(/%\{\s*ISSUE_ID\s*\}/, issue_id) .gsub(/%\{\s*ISSUE_PATH\s*\}/, issue_path) .gsub(/%\{\s*NOTE_TEXT\s*\}/, note_text) + .gsub(/%\{\s*SYSTEM_HEADER\s*\}/, text_header_message.to_s) + .gsub(/%\{\s*SYSTEM_FOOTER\s*\}/, text_footer_message.to_s) + .gsub(/%\{\s*UNSUBSCRIBE_URL\s*\}/, unsubscribe_sent_notification_url(@sent_notification)) + .gsub(/%\{\s*ADDITIONAL_TEXT\s*\}/, service_desk_email_additional_text.to_s) end def issue_id |