Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-17 21:07:17 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-17 21:07:17 +0300
commit3fbd6ba74ee268ad739599ae14dcf5c9b6acfc2c (patch)
treeeea3db86df012fd59b4db8c4ec132e494bdac8fb /app/views/notify
parentd41edc2e93480db35e48ad770ebe95075fbca871 (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.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/service_desk_new_note_email.html.haml b/app/views/notify/service_desk_new_note_email.html.haml
index 02f6b3914c9..969221d00d2 100644
--- a/app/views/notify/service_desk_new_note_email.html.haml
+++ b/app/views/notify/service_desk_new_note_email.html.haml
@@ -2,4 +2,4 @@
.gl-mb-5
= _("%{author_link} wrote:").html_safe % { author_link: link_to(@note.author_name, user_url(@note.author)) }
.md
- = markdown(@note.note, pipeline: :email, author: @note.author, issuable_reference_expansion_enabled: true)
+ = markdown(@note.note, pipeline: :service_desk_email, author: @note.author, issuable_reference_expansion_enabled: true, uploads_as_attachments: @uploads_as_attachments)