diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/mailers/emails/service_desk.rb | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
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 |