diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-26 18:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-26 18:08:51 +0300 |
commit | a3a9c1103b0f023deafc9fc9307032085419ff7d (patch) | |
tree | d4c73cc6e63e4ba79b1a854a747142e02dd4250d /app/views/notify | |
parent | 597d5ed08988cb00681eaf252d04ebae4bd24731 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
-rw-r--r-- | app/views/notify/request_review_merge_request_email.html.haml | 1 | ||||
-rw-r--r-- | app/views/notify/request_review_merge_request_email.text.erb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/notify/request_review_merge_request_email.html.haml b/app/views/notify/request_review_merge_request_email.html.haml index a8c7df79ff3..d5f5d155f3d 100644 --- a/app/views/notify/request_review_merge_request_email.html.haml +++ b/app/views/notify/request_review_merge_request_email.html.haml @@ -1,2 +1,3 @@ %p = html_escape(s_('Notify|%{name} requested a new review on %{mr_link}.')) % {name: sanitize_name(@updated_by.name), mr_link: merge_request_reference_link(@merge_request).html_safe} + = render_if_exists 'notify/diff_summary' diff --git a/app/views/notify/request_review_merge_request_email.text.erb b/app/views/notify/request_review_merge_request_email.text.erb index 9ab15332c51..dc1746d3a8c 100644 --- a/app/views/notify/request_review_merge_request_email.text.erb +++ b/app/views/notify/request_review_merge_request_email.text.erb @@ -1 +1,2 @@ <%= sanitize_name(@updated_by.name) %> requested a new review on <%= merge_request_reference_link(@merge_request) %>. +<%= render_if_exists 'notify/diff_summary' -%> |