Merge branch 'tor/maintenance/requested-review-email-polish' into 'master'

Improve review re-request email structure, layout, and design

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139002



Merged-by: Phil Hughes <me@iamphill.com>
Approved-by: Phil Hughes <me@iamphill.com>
Reviewed-by: Phil Hughes <me@iamphill.com>
Co-authored-by: Thomas Randolph <trandolph@gitlab.com>

app/views/notify/changed_reviewer_of_merge_request_email.html.haml

 = 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)

app/views/notify/request_review_merge_request_email.html.haml

-%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}
+- 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')
+%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')

locale/gitlab.pot

@@ -33502,6 +33502,12 @@ msgstr ""
 msgid "Notify|Remote mirror"
 msgstr ""
+msgid "Notify|Review changes"
+msgstr ""
+
+msgid "Notify|Review requested"
+msgstr ""
+
 msgid "Notify|SMTP host issue:"
 msgstr ""
@@ -33595,6 +33601,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 ""