diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-21 00:07:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-21 00:07:30 +0300 |
| commit | 5d7e5a8902382caaffa616e1b496b684ba72d148 (patch) | |
| tree | 30d755b056cdd521071b0b23ce8c5823ad18e355 /app/views/notify | |
| parent | cc4e1c884cd6b8782fb6a247d840a2d1c7f4603e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/service_desk_new_note_email.text.erb | 1 | ||||
| -rw-r--r-- | app/views/notify/service_desk_thank_you_email.text.erb | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/app/views/notify/service_desk_new_note_email.text.erb b/app/views/notify/service_desk_new_note_email.text.erb index 79144fc1bf4..bcac004f82c 100644 --- a/app/views/notify/service_desk_new_note_email.text.erb +++ b/app/views/notify/service_desk_new_note_email.text.erb @@ -3,4 +3,3 @@ <%= _("Author: %{author_name}") % { author_name: sanitize_name(@note.author_name) } %> <%= @note.note %> -<%# EE-specific start %><%= render_if_exists 'layouts/mailer/additional_text'%><%# EE-specific end %> diff --git a/app/views/notify/service_desk_thank_you_email.text.erb b/app/views/notify/service_desk_thank_you_email.text.erb index 8b52219c83b..9d9d5c7a1bf 100644 --- a/app/views/notify/service_desk_thank_you_email.text.erb +++ b/app/views/notify/service_desk_thank_you_email.text.erb @@ -1,6 +1,3 @@ <%= _("Thank you for your support request! We are tracking your request as ticket #%{issue_iid}, and will respond as soon as we can.") % { issue_iid: @issue.iid } %> <%= _("To unsubscribe from this issue, please paste the following link into your browser:") %> - -<%= @unsubscribe_url %> -<%# EE-specific start %><%= render_if_exists 'layouts/mailer/additional_text' %><%# EE-specific end %> |