Add latest changes from gitlab-org/gitlab@master

4 files changed, 8 insertions, 4 deletions

diff --git a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue
index 884edc97016..577c01c50ff 100644
--- a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue
@@ -17,7 +17,7 @@ const generateCollapsedAssigneeTooltip = ({ renderUsers, allUsers, tooltipTitleM
   });
 
   if (!allUsers.length) {
-    return __('Assignee(s)');
+    return __('Assignees');
   }
   if (allUsers.length > names.length) {
     names.push(sprintf(__('+ %{amount} more'), { amount: allUsers.length - names.length }));
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents.vue
index 89a976d45fa..1c27df2418d 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents.vue
@@ -40,7 +40,6 @@ export default {
   <div
     class="labels-select-dropdown-contents gl-w-full gl-my-2 gl-py-3 gl-rounded-base gl-absolute"
     data-testid="labels-select-dropdown-contents"
-    data-qa-selector="labels_dropdown_content"
     :style="directionStyle"
   >
     <component :is="dropdownContentsView" />
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue
index b44096c7743..b6ac314522c 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue
@@ -20,6 +20,11 @@ export default {
     GlDropdownItem,
     GlLink,
   },
+  inject: {
+    toggleAttrs: {
+      default: () => ({}),
+    },
+  },
   props: {
     labelsCreateTitle: {
       type: String,
@@ -204,7 +209,7 @@ export default {
     class="gl-w-full"
     block
     data-testid="labels-select-dropdown-contents"
-    data-qa-selector="labels_dropdown_content"
+    :toggle-attrs="toggleAttrs"
     @hide="handleDropdownHide"
     @shown="setFocus"
   >
diff --git a/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue b/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue
index 6f82178b6fd..88a74784dd2 100644
--- a/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue
+++ b/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue
@@ -67,7 +67,7 @@ export default {
       const names = renderUsers.map((u) => u.name);
 
       if (!this.users.length) {
-        return __('Reviewer(s)');
+        return __('Reviewers');
       }
 
       if (this.users.length > names.length) {