Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

3 files changed, 37 insertions, 21 deletions

diff --git a/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue b/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue
index b492194d1cf..872e1d4269d 100644
--- a/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue
+++ b/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue
@@ -1,18 +1,13 @@
 <script>
-import { GlDropdownItem, GlModalDirective } from '@gitlab/ui';
+import { GlDisclosureDropdownItem, GlModalDirective } from '@gitlab/ui';
 import { TYPE_ISSUE } from '~/issues/constants';
 import { __ } from '~/locale';
 import CsvExportModal from './csv_export_modal.vue';
 import CsvImportModal from './csv_import_modal.vue';
 
 export default {
-  i18n: {
-    exportAsCsvButtonText: __('Export as CSV'),
-    importCsvText: __('Import CSV'),
-    importFromJiraText: __('Import from Jira'),
-  },
   components: {
-    GlDropdownItem,
+    GlDisclosureDropdownItem,
     CsvExportModal,
     CsvImportModal,
   },
@@ -48,6 +43,22 @@ export default {
       default: undefined,
     },
   },
+  data() {
+    return {
+      dropdownItems: {
+        exportAsCSV: {
+          text: __('Export as CSV'),
+        },
+        importCSV: {
+          text: __('Import CSV'),
+        },
+        importFromJIRA: {
+          text: __('Import from Jira'),
+          href: this.projectImportJiraPath,
+        },
+      },
+    };
+  },
   computed: {
     exportModalId() {
       return `${this.issuableType}-export-modal`;
@@ -61,23 +72,25 @@ export default {
 
 <template>
   <ul class="gl-display-contents">
-    <gl-dropdown-item
+    <gl-disclosure-dropdown-item
       v-if="showExportButton"
       v-gl-modal="exportModalId"
+      data-testid="export-as-csv-button"
       data-qa-selector="export_as_csv_button"
-    >
-      {{ $options.i18n.exportAsCsvButtonText }}
-    </gl-dropdown-item>
-    <gl-dropdown-item v-if="showImportButton" v-gl-modal="importModalId">
-      {{ $options.i18n.importCsvText }}
-    </gl-dropdown-item>
-    <gl-dropdown-item
+      :item="dropdownItems.exportAsCSV"
+    />
+    <gl-disclosure-dropdown-item
+      v-if="showImportButton"
+      v-gl-modal="importModalId"
+      data-testid="import-from-csv-button"
+      :item="dropdownItems.importCSV"
+    />
+    <gl-disclosure-dropdown-item
       v-if="showImportButton && canEdit"
-      :href="projectImportJiraPath"
+      data-testid="import-from-jira-link"
       data-qa-selector="import_from_jira_link"
-    >
-      {{ $options.i18n.importFromJiraText }}
-    </gl-dropdown-item>
+      :item="dropdownItems.importFromJIRA"
+    />
 
     <csv-export-modal
       v-if="showExportButton"
diff --git a/app/assets/javascripts/issuable/components/issuable_header_warnings.vue b/app/assets/javascripts/issuable/components/issuable_header_warnings.vue
index 403997779ac..eab7d01be14 100644
--- a/app/assets/javascripts/issuable/components/issuable_header_warnings.vue
+++ b/app/assets/javascripts/issuable/components/issuable_header_warnings.vue
@@ -40,6 +40,9 @@ export default {
           iconName: 'lock',
           visible: this.isLocked,
           dataTestId: 'locked',
+          tooltip: sprintf(__('This %{issuable} is locked. Only project members can comment.'), {
+            issuable: noteableTypeText[this.getNoteableData.targetType],
+          }),
         },
         {
           iconName: 'spam',
@@ -67,7 +70,7 @@ export default {
       <div
         v-if="meta.visible"
         :key="meta.iconName"
-        v-gl-tooltip
+        v-gl-tooltip.bottom
         :data-testid="meta.dataTestId"
         :title="meta.tooltip || null"
         :class="{
diff --git a/app/assets/javascripts/issuable/components/related_issuable_item.vue b/app/assets/javascripts/issuable/components/related_issuable_item.vue
index df50a30abb7..ff48bfceb29 100644
--- a/app/assets/javascripts/issuable/components/related_issuable_item.vue
+++ b/app/assets/javascripts/issuable/components/related_issuable_item.vue
@@ -248,7 +248,7 @@ export default {
       size="small"
       :disabled="removeDisabled"
       class="js-issue-item-remove-button gl-mr-2"
-      data-qa-selector="remove_related_issue_button"
+      data-testid="remove_related_issue_button"
       :title="__('Remove')"
       :aria-label="__('Remove')"
       @click="onRemoveRequest"