From c9c0353da3bbb59d7c803b8b9b8b68c977ed7449 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 20 Dec 2021 13:16:44 -0700
Subject: [PATCH 1/8] Add attention requests to the MR list view

Changelog: added
---
 app/assets/stylesheets/pages/issuable.scss         | 10 ++++++++++
 app/helpers/projects_helper.rb                     |  2 +-
 app/views/shared/issuable/_assignees.html.haml     |  7 +++++--
 .../issuable/_merge_request_assignees.html.haml    |  8 ++++++++
 .../issuable/_merge_request_reviewers.html.haml    |  9 +++++++++
 app/views/shared/issuable/_reviewers.html.haml     |  7 +++++--
 locale/gitlab.pot                                  | 10 ++++++++--
 .../merge_requests/user_mass_updates_spec.rb       | 14 ++++++++++++++
 8 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 app/views/shared/issuable/_merge_request_assignees.html.haml
 create mode 100644 app/views/shared/issuable/_merge_request_reviewers.html.haml

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index cdef843c9b43f1..ad05cbd1f0e91a 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -890,3 +890,13 @@
     }
   }
 }
+
+.icon-overlap-and-shadow {
+  filter:
+    drop-shadow(0 1px 0.5px #fff)
+    drop-shadow(1px 0 0.5px #fff)
+    drop-shadow(0 -1px 0.5px #fff)
+    drop-shadow(-1px 0 0.5px #fff);
+  margin-right: -7px;
+  z-index: 1;
+}
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index c9966d87b6843a..0cf9ab359c6b5d 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -62,7 +62,7 @@ def link_to_member(project, author, opts = {}, &block)
       name: author.name
     }
 
-    inject_classes = ["author-link"]
+    inject_classes = ["author-link", opts[:raw_classes]]
 
     if opts[:name]
       inject_classes.concat(["js-user-link", opts[:extra_class], opts[:mobile_classes]])
diff --git a/app/views/shared/issuable/_assignees.html.haml b/app/views/shared/issuable/_assignees.html.haml
index 196d0417fb85f0..e65f18b076a487 100644
--- a/app/views/shared/issuable/_assignees.html.haml
+++ b/app/views/shared/issuable/_assignees.html.haml
@@ -3,8 +3,11 @@
 - render_count = assignees_rendering_overflow ? max_render - 1 : max_render
 - more_assignees_count = issuable.assignees.size - render_count
 
-- issuable.assignees.take(render_count).each do |assignee| # rubocop: disable CodeReuse/ActiveRecord
-  = link_to_member(@project, assignee, name: false, title: _("Assigned to %{name}") % { name: assignee.name})
+- if issuable.instance_of?(MergeRequest) && Feature.enabled?(:mr_attention_requests)
+  = render('shared/issuable/merge_request_assignees', issuable: issuable, count: render_count )
+- else
+  - issuable.assignees.take(render_count).each do |assignee| # rubocop: disable CodeReuse/ActiveRecord
+    = link_to_member(@project, assignee, name: false, title: _("Assigned to %{name}, go to their profile.") % { name: assignee.name})
 
 - if more_assignees_count > 0
   %span{ class: 'avatar-counter has-tooltip', data: { container: 'body', placement: 'bottom', 'line-type' => 'old', qa_selector: 'avatar_counter_content' }, title: _("+%{more_assignees_count} more assignees") % { more_assignees_count: more_assignees_count} }
diff --git a/app/views/shared/issuable/_merge_request_assignees.html.haml b/app/views/shared/issuable/_merge_request_assignees.html.haml
new file mode 100644
index 00000000000000..47d48ce5109e82
--- /dev/null
+++ b/app/views/shared/issuable/_merge_request_assignees.html.haml
@@ -0,0 +1,8 @@
+- issuable.merge_request_assignees.take(count).each do |merge_request_assignee| # rubocop: disable CodeReuse/ActiveRecord
+  - assignee = merge_request_assignee.assignee
+  - assignee_tooltip = ( merge_request_assignee.attention_requested? ? _("Attention requested from assignee %{name}, go to their profile.") : _("Assigned to %{name}, go to their profile.") ) % { name: assignee.name}
+
+  = link_to_member(@project, assignee, name: false, title: assignee_tooltip, raw_classes: "gl-flex-direction-row-reverse") do
+    - if merge_request_assignee.attention_requested?
+      %span.gl-display-inline-flex
+        = sprite_icon('attention-solid-sm', size: 16, css_class: 'gl-text-orange-500 icon-overlap-and-shadow')
diff --git a/app/views/shared/issuable/_merge_request_reviewers.html.haml b/app/views/shared/issuable/_merge_request_reviewers.html.haml
new file mode 100644
index 00000000000000..d843c16e66cae6
--- /dev/null
+++ b/app/views/shared/issuable/_merge_request_reviewers.html.haml
@@ -0,0 +1,9 @@
+- issuable.merge_request_reviewers.take(count).each do |merge_request_reviewer| # rubocop: disable CodeReuse/ActiveRecord
+  - reviewer = merge_request_reviewer.reviewer
+  - reviewer_tooltip = ( merge_request_reviewer.attention_requested? ? _("Attention requested from reviewer %{name}, go to their profile.") : _("Review requested from %{name}, go to their profile.") ) % { name: reviewer.name}
+
+  = link_to_member(@project, reviewer, name: false, title: reviewer_tooltip, raw_classes: "gl-flex-direction-row-reverse") do
+    - if merge_request_reviewer.attention_requested?
+      %span.gl-display-inline-flex
+        = sprite_icon('attention-solid-sm', size: 16, css_class: 'gl-text-orange-500 icon-overlap-and-shadow')
+
diff --git a/app/views/shared/issuable/_reviewers.html.haml b/app/views/shared/issuable/_reviewers.html.haml
index 8e66135a20b2ec..cf6ff9f6bc7a31 100644
--- a/app/views/shared/issuable/_reviewers.html.haml
+++ b/app/views/shared/issuable/_reviewers.html.haml
@@ -3,8 +3,11 @@
 - render_count = reviewers_rendering_overflow ? max_render - 1 : max_render
 - more_reviewers_count = issuable.reviewers.size - render_count
 
-- issuable.reviewers.take(render_count).each do |reviewer| # rubocop: disable CodeReuse/ActiveRecord
-  = link_to_member(@project, reviewer, name: false, title: _("Review requested from %{name}") % { name: reviewer.name})
+- if issuable.instance_of?(MergeRequest) && Feature.enabled?(:mr_attention_requests)
+  = render('shared/issuable/merge_request_reviewers', issuable: issuable, count: render_count )
+- else
+  - issuable.reviewers.take(render_count).each do |reviewer| # rubocop: disable CodeReuse/ActiveRecord
+    = link_to_member(@project, reviewer, name: false, title: _("Review requested from %{name}, go to their profile.") % { name: reviewer.name})
 
 - if more_reviewers_count > 0
   %span{ class: 'avatar-counter has-tooltip', data: { container: 'body', placement: 'bottom', 'line-type' => 'old' }, title: _("+%{more_reviewers_count} more reviewers") % { more_reviewers_count: more_reviewers_count} }
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 85934f61eeff58..08d3901953e94b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4903,7 +4903,7 @@ msgstr ""
 msgid "Assigned to %{assignee_name}"
 msgstr ""
 
-msgid "Assigned to %{name}"
+msgid "Assigned to %{name}, go to their profile."
 msgstr ""
 
 msgid "Assigned to me"
@@ -4970,6 +4970,12 @@ msgstr[1] ""
 msgid "Attaching the file failed."
 msgstr ""
 
+msgid "Attention requested from assignee %{name}, go to their profile."
+msgstr ""
+
+msgid "Attention requested from reviewer %{name}, go to their profile."
+msgstr ""
+
 msgid "Audit Events"
 msgstr ""
 
@@ -30690,7 +30696,7 @@ msgstr ""
 msgid "Review changes"
 msgstr ""
 
-msgid "Review requested from %{name}"
+msgid "Review requested from %{name}, go to their profile."
 msgstr ""
 
 msgid "Review requests for you"
diff --git a/spec/features/merge_requests/user_mass_updates_spec.rb b/spec/features/merge_requests/user_mass_updates_spec.rb
index 46c12784ea8798..f781ba0827c14e 100644
--- a/spec/features/merge_requests/user_mass_updates_spec.rb
+++ b/spec/features/merge_requests/user_mass_updates_spec.rb
@@ -8,6 +8,8 @@
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
 
   before do
+    stub_feature_flags(mr_attention_requests: false)
+
     project.add_maintainer(user)
     sign_in(user)
   end
@@ -59,6 +61,18 @@
 
         expect(find('.merge-request')).to have_link "Assigned to #{user.name}"
       end
+
+      describe 'with attention requests feature flag on' do
+        before do
+          stub_feature_flags(mr_attention_requests: true)
+        end
+
+        it 'updates merge request with assignee' do
+          change_assignee(user.name)
+
+          expect(find('.issuable-meta a.author-link')[:title]).to eq "Attention requested from assignee #{user.name}, go to their profile."
+        end
+      end
     end
 
     describe 'remove assignee' do
-- 
GitLab


From 04eaeed96f88454173fa90f4955d38cea45ca1c4 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 31 Jan 2022 20:01:33 -0700
Subject: [PATCH 2/8] Add yaml defaults to Feature flag checks

---
 app/views/shared/issuable/_assignees.html.haml | 2 +-
 app/views/shared/issuable/_reviewers.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/issuable/_assignees.html.haml b/app/views/shared/issuable/_assignees.html.haml
index e65f18b076a487..9aa693e1039e7e 100644
--- a/app/views/shared/issuable/_assignees.html.haml
+++ b/app/views/shared/issuable/_assignees.html.haml
@@ -3,7 +3,7 @@
 - render_count = assignees_rendering_overflow ? max_render - 1 : max_render
 - more_assignees_count = issuable.assignees.size - render_count
 
-- if issuable.instance_of?(MergeRequest) && Feature.enabled?(:mr_attention_requests)
+- if issuable.instance_of?(MergeRequest) && Feature.enabled?(:mr_attention_requests, default_enabled: :yaml)
   = render('shared/issuable/merge_request_assignees', issuable: issuable, count: render_count )
 - else
   - issuable.assignees.take(render_count).each do |assignee| # rubocop: disable CodeReuse/ActiveRecord
diff --git a/app/views/shared/issuable/_reviewers.html.haml b/app/views/shared/issuable/_reviewers.html.haml
index cf6ff9f6bc7a31..6bd95ef9844317 100644
--- a/app/views/shared/issuable/_reviewers.html.haml
+++ b/app/views/shared/issuable/_reviewers.html.haml
@@ -3,7 +3,7 @@
 - render_count = reviewers_rendering_overflow ? max_render - 1 : max_render
 - more_reviewers_count = issuable.reviewers.size - render_count
 
-- if issuable.instance_of?(MergeRequest) && Feature.enabled?(:mr_attention_requests)
+- if issuable.instance_of?(MergeRequest) && Feature.enabled?(:mr_attention_requests, default_enabled: :yaml)
   = render('shared/issuable/merge_request_reviewers', issuable: issuable, count: render_count )
 - else
   - issuable.reviewers.take(render_count).each do |reviewer| # rubocop: disable CodeReuse/ActiveRecord
-- 
GitLab


From 768ac92a96baa9e083be0e390913625ab0a131d0 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 31 Jan 2022 20:05:32 -0700
Subject: [PATCH 3/8] Remove default size for icon sprite

---
 app/views/shared/issuable/_merge_request_assignees.html.haml | 2 +-
 app/views/shared/issuable/_merge_request_reviewers.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/issuable/_merge_request_assignees.html.haml b/app/views/shared/issuable/_merge_request_assignees.html.haml
index 47d48ce5109e82..d18d7c2664705b 100644
--- a/app/views/shared/issuable/_merge_request_assignees.html.haml
+++ b/app/views/shared/issuable/_merge_request_assignees.html.haml
@@ -5,4 +5,4 @@
   = link_to_member(@project, assignee, name: false, title: assignee_tooltip, raw_classes: "gl-flex-direction-row-reverse") do
     - if merge_request_assignee.attention_requested?
       %span.gl-display-inline-flex
-        = sprite_icon('attention-solid-sm', size: 16, css_class: 'gl-text-orange-500 icon-overlap-and-shadow')
+        = sprite_icon('attention-solid-sm', css_class: 'gl-text-orange-500 icon-overlap-and-shadow')
diff --git a/app/views/shared/issuable/_merge_request_reviewers.html.haml b/app/views/shared/issuable/_merge_request_reviewers.html.haml
index d843c16e66cae6..63f1b81a6ed0c0 100644
--- a/app/views/shared/issuable/_merge_request_reviewers.html.haml
+++ b/app/views/shared/issuable/_merge_request_reviewers.html.haml
@@ -5,5 +5,5 @@
   = link_to_member(@project, reviewer, name: false, title: reviewer_tooltip, raw_classes: "gl-flex-direction-row-reverse") do
     - if merge_request_reviewer.attention_requested?
       %span.gl-display-inline-flex
-        = sprite_icon('attention-solid-sm', size: 16, css_class: 'gl-text-orange-500 icon-overlap-and-shadow')
+        = sprite_icon('attention-solid-sm', css_class: 'gl-text-orange-500 icon-overlap-and-shadow')
 
-- 
GitLab


From 8869f4a2bfa26accbb9c9d08087cf73168258b24 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 31 Jan 2022 22:03:07 -0700
Subject: [PATCH 4/8] Namespace UI text strings

---
 .../shared/issuable/_assignees.html.haml      |  2 +-
 .../_merge_request_assignees.html.haml        |  2 +-
 .../_merge_request_reviewers.html.haml        |  2 +-
 .../shared/issuable/_reviewers.html.haml      |  2 +-
 locale/gitlab.pot                             | 24 +++++++++----------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/views/shared/issuable/_assignees.html.haml b/app/views/shared/issuable/_assignees.html.haml
index 9aa693e1039e7e..5b54dbedb46c00 100644
--- a/app/views/shared/issuable/_assignees.html.haml
+++ b/app/views/shared/issuable/_assignees.html.haml
@@ -7,7 +7,7 @@
   = render('shared/issuable/merge_request_assignees', issuable: issuable, count: render_count )
 - else
   - issuable.assignees.take(render_count).each do |assignee| # rubocop: disable CodeReuse/ActiveRecord
-    = link_to_member(@project, assignee, name: false, title: _("Assigned to %{name}, go to their profile.") % { name: assignee.name})
+    = link_to_member(@project, assignee, name: false, title: _("MrList|Assigned to %{name}, go to their profile.") % { name: assignee.name})
 
 - if more_assignees_count > 0
   %span{ class: 'avatar-counter has-tooltip', data: { container: 'body', placement: 'bottom', 'line-type' => 'old', qa_selector: 'avatar_counter_content' }, title: _("+%{more_assignees_count} more assignees") % { more_assignees_count: more_assignees_count} }
diff --git a/app/views/shared/issuable/_merge_request_assignees.html.haml b/app/views/shared/issuable/_merge_request_assignees.html.haml
index d18d7c2664705b..665d597d06e79d 100644
--- a/app/views/shared/issuable/_merge_request_assignees.html.haml
+++ b/app/views/shared/issuable/_merge_request_assignees.html.haml
@@ -1,6 +1,6 @@
 - issuable.merge_request_assignees.take(count).each do |merge_request_assignee| # rubocop: disable CodeReuse/ActiveRecord
   - assignee = merge_request_assignee.assignee
-  - assignee_tooltip = ( merge_request_assignee.attention_requested? ? _("Attention requested from assignee %{name}, go to their profile.") : _("Assigned to %{name}, go to their profile.") ) % { name: assignee.name}
+  - assignee_tooltip = ( merge_request_assignee.attention_requested? ? _("MrList|Attention requested from assignee %{name}, go to their profile.") : _("MrList|Assigned to %{name}, go to their profile.") ) % { name: assignee.name}
 
   = link_to_member(@project, assignee, name: false, title: assignee_tooltip, raw_classes: "gl-flex-direction-row-reverse") do
     - if merge_request_assignee.attention_requested?
diff --git a/app/views/shared/issuable/_merge_request_reviewers.html.haml b/app/views/shared/issuable/_merge_request_reviewers.html.haml
index 63f1b81a6ed0c0..cab6a9e9759306 100644
--- a/app/views/shared/issuable/_merge_request_reviewers.html.haml
+++ b/app/views/shared/issuable/_merge_request_reviewers.html.haml
@@ -1,6 +1,6 @@
 - issuable.merge_request_reviewers.take(count).each do |merge_request_reviewer| # rubocop: disable CodeReuse/ActiveRecord
   - reviewer = merge_request_reviewer.reviewer
-  - reviewer_tooltip = ( merge_request_reviewer.attention_requested? ? _("Attention requested from reviewer %{name}, go to their profile.") : _("Review requested from %{name}, go to their profile.") ) % { name: reviewer.name}
+  - reviewer_tooltip = ( merge_request_reviewer.attention_requested? ? s_("MrList|Attention requested from reviewer %{name}, go to their profile.") : _("MrList|Review requested from %{name}, go to their profile.") ) % { name: reviewer.name}
 
   = link_to_member(@project, reviewer, name: false, title: reviewer_tooltip, raw_classes: "gl-flex-direction-row-reverse") do
     - if merge_request_reviewer.attention_requested?
diff --git a/app/views/shared/issuable/_reviewers.html.haml b/app/views/shared/issuable/_reviewers.html.haml
index 6bd95ef9844317..df5fe611fe74c1 100644
--- a/app/views/shared/issuable/_reviewers.html.haml
+++ b/app/views/shared/issuable/_reviewers.html.haml
@@ -7,7 +7,7 @@
   = render('shared/issuable/merge_request_reviewers', issuable: issuable, count: render_count )
 - else
   - issuable.reviewers.take(render_count).each do |reviewer| # rubocop: disable CodeReuse/ActiveRecord
-    = link_to_member(@project, reviewer, name: false, title: _("Review requested from %{name}, go to their profile.") % { name: reviewer.name})
+    = link_to_member(@project, reviewer, name: false, title: _("MrList|Review requested from %{name}, go to their profile.") % { name: reviewer.name})
 
 - if more_reviewers_count > 0
   %span{ class: 'avatar-counter has-tooltip', data: { container: 'body', placement: 'bottom', 'line-type' => 'old' }, title: _("+%{more_reviewers_count} more reviewers") % { more_reviewers_count: more_reviewers_count} }
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 08d3901953e94b..00437435f4d6e9 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4903,9 +4903,6 @@ msgstr ""
 msgid "Assigned to %{assignee_name}"
 msgstr ""
 
-msgid "Assigned to %{name}, go to their profile."
-msgstr ""
-
 msgid "Assigned to me"
 msgstr ""
 
@@ -4970,12 +4967,6 @@ msgstr[1] ""
 msgid "Attaching the file failed."
 msgstr ""
 
-msgid "Attention requested from assignee %{name}, go to their profile."
-msgstr ""
-
-msgid "Attention requested from reviewer %{name}, go to their profile."
-msgstr ""
-
 msgid "Audit Events"
 msgstr ""
 
@@ -23413,6 +23404,18 @@ msgstr ""
 msgid "MrDeploymentActions|Stop environment"
 msgstr ""
 
+msgid "MrList|Assigned to %{name}, go to their profile."
+msgstr ""
+
+msgid "MrList|Attention requested from assignee %{name}, go to their profile."
+msgstr ""
+
+msgid "MrList|Attention requested from reviewer %{name}, go to their profile."
+msgstr ""
+
+msgid "MrList|Review requested from %{name}, go to their profile."
+msgstr ""
+
 msgid "Multi-project"
 msgstr ""
 
@@ -30696,9 +30699,6 @@ msgstr ""
 msgid "Review changes"
 msgstr ""
 
-msgid "Review requested from %{name}, go to their profile."
-msgstr ""
-
 msgid "Review requests for you"
 msgstr ""
 
-- 
GitLab


From 9f9592b09f6802b63b0ef8aafafa6d4779cd71ab Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 31 Jan 2022 22:04:26 -0700
Subject: [PATCH 5/8] Remove empty line

---
 app/views/shared/issuable/_merge_request_reviewers.html.haml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/shared/issuable/_merge_request_reviewers.html.haml b/app/views/shared/issuable/_merge_request_reviewers.html.haml
index cab6a9e9759306..b9f190e35b8d7a 100644
--- a/app/views/shared/issuable/_merge_request_reviewers.html.haml
+++ b/app/views/shared/issuable/_merge_request_reviewers.html.haml
@@ -6,4 +6,3 @@
     - if merge_request_reviewer.attention_requested?
       %span.gl-display-inline-flex
         = sprite_icon('attention-solid-sm', css_class: 'gl-text-orange-500 icon-overlap-and-shadow')
-
-- 
GitLab


From f181395fd78f92efa0fe58efe4a170373ec50dc7 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 1 Feb 2022 20:12:34 -0700
Subject: [PATCH 6/8] Switch to re-using the existing `extra_class` helper
 option

---
 app/helpers/projects_helper.rb                               | 4 ++--
 app/views/shared/issuable/_merge_request_assignees.html.haml | 2 +-
 app/views/shared/issuable/_merge_request_reviewers.html.haml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 0cf9ab359c6b5d..b39cd485fe8989 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -62,10 +62,10 @@ def link_to_member(project, author, opts = {}, &block)
       name: author.name
     }
 
-    inject_classes = ["author-link", opts[:raw_classes]]
+    inject_classes = ["author-link", opts[:extra_class]]
 
     if opts[:name]
-      inject_classes.concat(["js-user-link", opts[:extra_class], opts[:mobile_classes]])
+      inject_classes.concat(["js-user-link", opts[:mobile_classes]])
     else
       inject_classes.append( "has-tooltip" )
     end
diff --git a/app/views/shared/issuable/_merge_request_assignees.html.haml b/app/views/shared/issuable/_merge_request_assignees.html.haml
index 665d597d06e79d..5d516669ab5c44 100644
--- a/app/views/shared/issuable/_merge_request_assignees.html.haml
+++ b/app/views/shared/issuable/_merge_request_assignees.html.haml
@@ -2,7 +2,7 @@
   - assignee = merge_request_assignee.assignee
   - assignee_tooltip = ( merge_request_assignee.attention_requested? ? _("MrList|Attention requested from assignee %{name}, go to their profile.") : _("MrList|Assigned to %{name}, go to their profile.") ) % { name: assignee.name}
 
-  = link_to_member(@project, assignee, name: false, title: assignee_tooltip, raw_classes: "gl-flex-direction-row-reverse") do
+  = link_to_member(@project, assignee, name: false, title: assignee_tooltip, extra_class: "gl-flex-direction-row-reverse") do
     - if merge_request_assignee.attention_requested?
       %span.gl-display-inline-flex
         = sprite_icon('attention-solid-sm', css_class: 'gl-text-orange-500 icon-overlap-and-shadow')
diff --git a/app/views/shared/issuable/_merge_request_reviewers.html.haml b/app/views/shared/issuable/_merge_request_reviewers.html.haml
index b9f190e35b8d7a..82e90863965970 100644
--- a/app/views/shared/issuable/_merge_request_reviewers.html.haml
+++ b/app/views/shared/issuable/_merge_request_reviewers.html.haml
@@ -2,7 +2,7 @@
   - reviewer = merge_request_reviewer.reviewer
   - reviewer_tooltip = ( merge_request_reviewer.attention_requested? ? s_("MrList|Attention requested from reviewer %{name}, go to their profile.") : _("MrList|Review requested from %{name}, go to their profile.") ) % { name: reviewer.name}
 
-  = link_to_member(@project, reviewer, name: false, title: reviewer_tooltip, raw_classes: "gl-flex-direction-row-reverse") do
+  = link_to_member(@project, reviewer, name: false, title: reviewer_tooltip, extra_class: "gl-flex-direction-row-reverse") do
     - if merge_request_reviewer.attention_requested?
       %span.gl-display-inline-flex
         = sprite_icon('attention-solid-sm', css_class: 'gl-text-orange-500 icon-overlap-and-shadow')
-- 
GitLab


From 35296180a1d77f33e0530d7a9adc98286b0ce4e5 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 2 Feb 2022 16:21:21 -0700
Subject: [PATCH 7/8] Remove parens from function call

---
 app/views/shared/issuable/_assignees.html.haml | 2 +-
 app/views/shared/issuable/_reviewers.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/issuable/_assignees.html.haml b/app/views/shared/issuable/_assignees.html.haml
index 5b54dbedb46c00..8ab62288dc441b 100644
--- a/app/views/shared/issuable/_assignees.html.haml
+++ b/app/views/shared/issuable/_assignees.html.haml
@@ -4,7 +4,7 @@
 - more_assignees_count = issuable.assignees.size - render_count
 
 - if issuable.instance_of?(MergeRequest) && Feature.enabled?(:mr_attention_requests, default_enabled: :yaml)
-  = render('shared/issuable/merge_request_assignees', issuable: issuable, count: render_count )
+  = render 'shared/issuable/merge_request_assignees', issuable: issuable, count: render_count
 - else
   - issuable.assignees.take(render_count).each do |assignee| # rubocop: disable CodeReuse/ActiveRecord
     = link_to_member(@project, assignee, name: false, title: _("MrList|Assigned to %{name}, go to their profile.") % { name: assignee.name})
diff --git a/app/views/shared/issuable/_reviewers.html.haml b/app/views/shared/issuable/_reviewers.html.haml
index df5fe611fe74c1..8003ef22054eb0 100644
--- a/app/views/shared/issuable/_reviewers.html.haml
+++ b/app/views/shared/issuable/_reviewers.html.haml
@@ -4,7 +4,7 @@
 - more_reviewers_count = issuable.reviewers.size - render_count
 
 - if issuable.instance_of?(MergeRequest) && Feature.enabled?(:mr_attention_requests, default_enabled: :yaml)
-  = render('shared/issuable/merge_request_reviewers', issuable: issuable, count: render_count )
+  = render 'shared/issuable/merge_request_reviewers', issuable: issuable, count: render_count
 - else
   - issuable.reviewers.take(render_count).each do |reviewer| # rubocop: disable CodeReuse/ActiveRecord
     = link_to_member(@project, reviewer, name: false, title: _("MrList|Review requested from %{name}, go to their profile.") % { name: reviewer.name})
-- 
GitLab


From 096d3995fa78486a07e825210dec0456f5b93d78 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 2 Feb 2022 16:55:08 -0700
Subject: [PATCH 8/8] Use namespacing localization function

---
 app/views/shared/issuable/_assignees.html.haml               | 2 +-
 app/views/shared/issuable/_merge_request_assignees.html.haml | 2 +-
 app/views/shared/issuable/_merge_request_reviewers.html.haml | 2 +-
 app/views/shared/issuable/_reviewers.html.haml               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/shared/issuable/_assignees.html.haml b/app/views/shared/issuable/_assignees.html.haml
index 8ab62288dc441b..e6d722cb08d0af 100644
--- a/app/views/shared/issuable/_assignees.html.haml
+++ b/app/views/shared/issuable/_assignees.html.haml
@@ -7,7 +7,7 @@
   = render 'shared/issuable/merge_request_assignees', issuable: issuable, count: render_count
 - else
   - issuable.assignees.take(render_count).each do |assignee| # rubocop: disable CodeReuse/ActiveRecord
-    = link_to_member(@project, assignee, name: false, title: _("MrList|Assigned to %{name}, go to their profile.") % { name: assignee.name})
+    = link_to_member(@project, assignee, name: false, title: s_("MrList|Assigned to %{name}, go to their profile.") % { name: assignee.name})
 
 - if more_assignees_count > 0
   %span{ class: 'avatar-counter has-tooltip', data: { container: 'body', placement: 'bottom', 'line-type' => 'old', qa_selector: 'avatar_counter_content' }, title: _("+%{more_assignees_count} more assignees") % { more_assignees_count: more_assignees_count} }
diff --git a/app/views/shared/issuable/_merge_request_assignees.html.haml b/app/views/shared/issuable/_merge_request_assignees.html.haml
index 5d516669ab5c44..13dc6ae4abbc77 100644
--- a/app/views/shared/issuable/_merge_request_assignees.html.haml
+++ b/app/views/shared/issuable/_merge_request_assignees.html.haml
@@ -1,6 +1,6 @@
 - issuable.merge_request_assignees.take(count).each do |merge_request_assignee| # rubocop: disable CodeReuse/ActiveRecord
   - assignee = merge_request_assignee.assignee
-  - assignee_tooltip = ( merge_request_assignee.attention_requested? ? _("MrList|Attention requested from assignee %{name}, go to their profile.") : _("MrList|Assigned to %{name}, go to their profile.") ) % { name: assignee.name}
+  - assignee_tooltip = ( merge_request_assignee.attention_requested? ? s_("MrList|Attention requested from assignee %{name}, go to their profile.") : s_("MrList|Assigned to %{name}, go to their profile.") ) % { name: assignee.name}
 
   = link_to_member(@project, assignee, name: false, title: assignee_tooltip, extra_class: "gl-flex-direction-row-reverse") do
     - if merge_request_assignee.attention_requested?
diff --git a/app/views/shared/issuable/_merge_request_reviewers.html.haml b/app/views/shared/issuable/_merge_request_reviewers.html.haml
index 82e90863965970..df5c69e309f7d1 100644
--- a/app/views/shared/issuable/_merge_request_reviewers.html.haml
+++ b/app/views/shared/issuable/_merge_request_reviewers.html.haml
@@ -1,6 +1,6 @@
 - issuable.merge_request_reviewers.take(count).each do |merge_request_reviewer| # rubocop: disable CodeReuse/ActiveRecord
   - reviewer = merge_request_reviewer.reviewer
-  - reviewer_tooltip = ( merge_request_reviewer.attention_requested? ? s_("MrList|Attention requested from reviewer %{name}, go to their profile.") : _("MrList|Review requested from %{name}, go to their profile.") ) % { name: reviewer.name}
+  - reviewer_tooltip = ( merge_request_reviewer.attention_requested? ? s_("MrList|Attention requested from reviewer %{name}, go to their profile.") : s_("MrList|Review requested from %{name}, go to their profile.") ) % { name: reviewer.name}
 
   = link_to_member(@project, reviewer, name: false, title: reviewer_tooltip, extra_class: "gl-flex-direction-row-reverse") do
     - if merge_request_reviewer.attention_requested?
diff --git a/app/views/shared/issuable/_reviewers.html.haml b/app/views/shared/issuable/_reviewers.html.haml
index 8003ef22054eb0..0bb0faa0bb87a6 100644
--- a/app/views/shared/issuable/_reviewers.html.haml
+++ b/app/views/shared/issuable/_reviewers.html.haml
@@ -7,7 +7,7 @@
   = render 'shared/issuable/merge_request_reviewers', issuable: issuable, count: render_count
 - else
   - issuable.reviewers.take(render_count).each do |reviewer| # rubocop: disable CodeReuse/ActiveRecord
-    = link_to_member(@project, reviewer, name: false, title: _("MrList|Review requested from %{name}, go to their profile.") % { name: reviewer.name})
+    = link_to_member(@project, reviewer, name: false, title: s_("MrList|Review requested from %{name}, go to their profile.") % { name: reviewer.name})
 
 - if more_reviewers_count > 0
   %span{ class: 'avatar-counter has-tooltip', data: { container: 'body', placement: 'bottom', 'line-type' => 'old' }, title: _("+%{more_reviewers_count} more reviewers") % { more_reviewers_count: more_reviewers_count} }
-- 
GitLab