diff options
Diffstat (limited to 'app/mailers/emails/service_desk.rb')
| -rw-r--r-- | app/mailers/emails/service_desk.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/mailers/emails/service_desk.rb b/app/mailers/emails/service_desk.rb index 29fe608472d..fa646487819 100644 --- a/app/mailers/emails/service_desk.rb +++ b/app/mailers/emails/service_desk.rb @@ -58,10 +58,12 @@ module Emails def template_content(email_type) template = Gitlab::Template::ServiceDeskTemplate.find(email_type, @project) - text = substitute_template_replacements(template.content) - markdown(text, project: @project) + context = { project: @project, pipeline: :email } + context[:author] = @note.author if email_type == 'new_note' + + markdown(text, context) rescue Gitlab::Template::Finders::RepoTemplateFinder::FileNotFoundError nil end |