From f6afb84f78c6860664b28a70b19932162bc45e92 Mon Sep 17 00:00:00 2001
From: charlie ablett <cablett@gitlab.com>
Date: Thu, 12 May 2022 15:15:36 +1200
Subject: [PATCH] Update MR merge conflict HTML email
- to be consistent with text
Changelog: changed
---
.../notify/merge_request_unmergeable_email.html.haml | 8 ++++++++
spec/mailers/emails/merge_requests_spec.rb | 2 ++
2 files changed, 10 insertions(+)
diff --git a/app/views/notify/merge_request_unmergeable_email.html.haml b/app/views/notify/merge_request_unmergeable_email.html.haml
index 6bcff28985c86..f0a5e5d43673f 100644
--- a/app/views/notify/merge_request_unmergeable_email.html.haml
+++ b/app/views/notify/merge_request_unmergeable_email.html.haml
@@ -1,2 +1,10 @@
%p
= sprintf(s_('Notify|Merge request %{merge_request} can no longer be merged due to conflict.'), { merge_request: merge_request_reference_link(@merge_request) }).html_safe
+%p
+ = merge_path_description(@merge_request, 'to')
+%p
+ = sprintf(s_('Author: %{author_name}'), { author_name: sanitize_name(@merge_request.author_name) })
+%p
+ = assignees_label(@merge_request)
+%p
+ = reviewers_label(@merge_request)
diff --git a/spec/mailers/emails/merge_requests_spec.rb b/spec/mailers/emails/merge_requests_spec.rb
index d4dc7a7651638..7682cf3945077 100644
--- a/spec/mailers/emails/merge_requests_spec.rb
+++ b/spec/mailers/emails/merge_requests_spec.rb
@@ -65,7 +65,9 @@
is_expected.to have_body_text('due to conflict.')
is_expected.to have_link(merge_request.to_reference, href: project_merge_request_url(merge_request.target_project, merge_request))
is_expected.to have_text_part_content(assignee.name)
+ is_expected.to have_html_part_content(assignee.name)
is_expected.to have_text_part_content(reviewer.name)
+ is_expected.to have_html_part_content(reviewer.name)
end
end
end
--
GitLab