From 18ca95c192750c56c07e5a0a1d789f76d5a1c040 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Fri, 15 Dec 2023 19:21:04 -0700 Subject: [PATCH 1/7] Remove emphasis from reviewers list --- .../notify/changed_reviewer_of_merge_request_email.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/notify/changed_reviewer_of_merge_request_email.html.haml b/app/views/notify/changed_reviewer_of_merge_request_email.html.haml index f080a5798f1efd..51042c3020a4e0 100644 --- a/app/views/notify/changed_reviewer_of_merge_request_email.html.haml +++ b/app/views/notify/changed_reviewer_of_merge_request_email.html.haml @@ -1,4 +1,4 @@ = render_if_exists 'notify/address_new_reviewer_with_diff_summary' %p - = change_reviewer_notification_text(@merge_request.reviewers, @previous_reviewers, :strong) + = change_reviewer_notification_text(@merge_request.reviewers, @previous_reviewers) -- GitLab From 96966328ea7d42937d599000b2461fc92b9cd7c0 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Fri, 15 Dec 2023 19:29:20 -0700 Subject: [PATCH 2/7] Add review requested header --- app/views/notify/request_review_merge_request_email.html.haml | 2 ++ 1 file changed, 2 insertions(+) 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 d5f5d155f3d2b1..fd57287cb64593 100644 --- a/app/views/notify/request_review_merge_request_email.html.haml +++ b/app/views/notify/request_review_merge_request_email.html.haml @@ -1,3 +1,5 @@ +%h4{ style: 'margin-bottom: 0' } + = _('Notify|Review requested') %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' -- GitLab From 1b715f699d6b6e1e0f25a3c626ffdf85ecc1f001 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Fri, 15 Dec 2023 23:18:22 -0700 Subject: [PATCH 3/7] Update request review email body --- .../notify/request_review_merge_request_email.html.haml | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 fd57287cb64593..0fdc9ef1ebc80b 100644 --- a/app/views/notify/request_review_merge_request_email.html.haml +++ b/app/views/notify/request_review_merge_request_email.html.haml @@ -1,5 +1,7 @@ +- long_mr = '!%{mriid} %{mrtitle}' % { mriid: @merge_request.iid, mrtitle: @merge_request.title } + %h4{ style: 'margin-bottom: 0' } - = _('Notify|Review requested') -%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} + = s_('Notify|Review requested') +%p{ style: 'margin-top: 0' } + = html_escape(s_('Notify|You were added as a reviewer on %{long_mr} by %{name}.')) % {name: sanitize_name(@updated_by.name), long_mr: long_mr} = render_if_exists 'notify/diff_summary' -- GitLab From 7b8f05ceb8dcdc54caf9debed025d8ea41f8968b Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Fri, 15 Dec 2023 19:30:09 -0700 Subject: [PATCH 4/7] Add call to action sending the user to the MR page --- app/views/notify/request_review_merge_request_email.html.haml | 4 ++++ 1 file changed, 4 insertions(+) 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 0fdc9ef1ebc80b..ef26f29e832014 100644 --- a/app/views/notify/request_review_merge_request_email.html.haml +++ b/app/views/notify/request_review_merge_request_email.html.haml @@ -1,7 +1,11 @@ - long_mr = '!%{mriid} %{mrtitle}' % { mriid: @merge_request.iid, mrtitle: @merge_request.title } +- mr_url = merge_request_url(@merge_request) %h4{ style: 'margin-bottom: 0' } = s_('Notify|Review requested') %p{ style: 'margin-top: 0' } = html_escape(s_('Notify|You were added as a reviewer on %{long_mr} by %{name}.')) % {name: sanitize_name(@updated_by.name), long_mr: long_mr} = render_if_exists 'notify/diff_summary' +%p + %a{ href: mr_url, target: "_blank", rel: "noopener noreferrer nofollow", style: "-webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-size: 14px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif; color: #ffffff; text-decoration: none; border-radius: 4px; -webkit-border-radius: 4px; background-color: #1f75cb; display: inline-block; padding: 8px 12px; box-shadow: inset 0 0 0 1px #1068bf" } + = s_('Notify|Review changes') -- GitLab From 4738fbce9c64ae4f8a27a832b60d7d6e57aa5f06 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Fri, 15 Dec 2023 23:25:47 -0700 Subject: [PATCH 5/7] Update localizations --- locale/gitlab.pot | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8bdd11c1a8c47b..48c3a058963385 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -33535,6 +33535,12 @@ msgstr "" msgid "Notify|Remote mirror" msgstr "" +msgid "Notify|Review changes" +msgstr "" + +msgid "Notify|Review requested" +msgstr "" + msgid "Notify|SMTP host issue:" msgstr "" @@ -33628,6 +33634,9 @@ msgstr "" msgid "Notify|You have been unsubscribed from receiving GitLab administrator notifications." msgstr "" +msgid "Notify|You were added as a reviewer on %{long_mr} by %{name}." +msgstr "" + msgid "Notify|Your CSV import for project %{project_link} has been completed." msgstr "" -- GitLab From d2737d3dd439f3748bf46c4b9e59b8887075df7b Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Mon, 12 Feb 2024 16:31:56 +0000 Subject: [PATCH 6/7] Switch from explicit "exclamation mark plus iid" to MR ".to_reference" --- app/views/notify/request_review_merge_request_email.html.haml | 3 +-- 1 file changed, 1 insertion(+), 2 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 ef26f29e832014..5dec1396eea12b 100644 --- a/app/views/notify/request_review_merge_request_email.html.haml +++ b/app/views/notify/request_review_merge_request_email.html.haml @@ -1,5 +1,4 @@ -- long_mr = '!%{mriid} %{mrtitle}' % { mriid: @merge_request.iid, mrtitle: @merge_request.title } -- mr_url = merge_request_url(@merge_request) +- long_mr = '%{reference} %{mrtitle}' % { reference: @merge_request.to_reference, mrtitle: @merge_request.title } %h4{ style: 'margin-bottom: 0' } = s_('Notify|Review requested') -- GitLab From 36a7c28db0c3770a154b14122a9dc9daf95fdee8 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Tue, 13 Feb 2024 14:09:01 -0700 Subject: [PATCH 7/7] Re-add mr_url that was removed In - apparently - a bad conflict resolution? Unclear how this line was deleted. --- app/views/notify/request_review_merge_request_email.html.haml | 1 + 1 file changed, 1 insertion(+) 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 5dec1396eea12b..d0459af8b5690d 100644 --- a/app/views/notify/request_review_merge_request_email.html.haml +++ b/app/views/notify/request_review_merge_request_email.html.haml @@ -1,4 +1,5 @@ - long_mr = '%{reference} %{mrtitle}' % { reference: @merge_request.to_reference, mrtitle: @merge_request.title } +- mr_url = merge_request_url(@merge_request) %h4{ style: 'margin-bottom: 0' } = s_('Notify|Review requested') -- GitLab