Add latest changes from gitlab-org/gitlab@master

5 files changed, 10 insertions, 12 deletions

diff --git a/app/assets/javascripts/super_sidebar/components/brand_logo.vue b/app/assets/javascripts/super_sidebar/components/brand_logo.vue
index 2e5499b6bbf..b346d3d43e8 100644
--- a/app/assets/javascripts/super_sidebar/components/brand_logo.vue
+++ b/app/assets/javascripts/super_sidebar/components/brand_logo.vue
@@ -26,7 +26,7 @@ export default {
 
 <template>
   <a
-    v-gl-tooltip:super-sidebar.hover.noninteractive.bottom.ds500="$options.i18n.homepage"
+    v-gl-tooltip:super-sidebar.hover.bottom.ds500="$options.i18n.homepage"
     class="brand-logo"
     :href="rootPath"
     data-track-action="click_link"
diff --git a/app/assets/javascripts/super_sidebar/components/create_menu.vue b/app/assets/javascripts/super_sidebar/components/create_menu.vue
index 97d11e74482..2347e74fdee 100644
--- a/app/assets/javascripts/super_sidebar/components/create_menu.vue
+++ b/app/assets/javascripts/super_sidebar/components/create_menu.vue
@@ -62,9 +62,7 @@ export default {
 
 <template>
   <gl-disclosure-dropdown
-    v-gl-tooltip:super-sidebar.hover.noninteractive.ds500.bottom="
-      dropdownOpen ? '' : $options.i18n.createNew
-    "
+    v-gl-tooltip:super-sidebar.hover.ds500.bottom="dropdownOpen ? '' : $options.i18n.createNew"
     category="tertiary"
     icon="plus"
     no-caret
diff --git a/app/assets/javascripts/super_sidebar/components/nav_item.vue b/app/assets/javascripts/super_sidebar/components/nav_item.vue
index 75083fcebef..93e004f0328 100644
--- a/app/assets/javascripts/super_sidebar/components/nav_item.vue
+++ b/app/assets/javascripts/super_sidebar/components/nav_item.vue
@@ -216,7 +216,7 @@ export default {
         </gl-badge>
         <gl-button
           v-if="isPinnable && !isPinned"
-          v-gl-tooltip.noninteractive.ds500.right.viewport="$options.i18n.pinItem"
+          v-gl-tooltip.ds500.right.viewport="$options.i18n.pinItem"
           size="small"
           category="tertiary"
           icon="thumbtack"
@@ -228,7 +228,7 @@ export default {
         />
         <gl-button
           v-else-if="isPinnable && isPinned"
-          v-gl-tooltip.noninteractive.ds500.right.viewport="$options.i18n.unpinItem"
+          v-gl-tooltip.ds500.right.viewport="$options.i18n.unpinItem"
           size="small"
           category="tertiary"
           :aria-label="$options.i18n.unpinItem"
diff --git a/app/assets/javascripts/super_sidebar/components/super_sidebar_toggle.vue b/app/assets/javascripts/super_sidebar/components/super_sidebar_toggle.vue
index f3f7dd587db..3ad59000ad3 100644
--- a/app/assets/javascripts/super_sidebar/components/super_sidebar_toggle.vue
+++ b/app/assets/javascripts/super_sidebar/components/super_sidebar_toggle.vue
@@ -73,7 +73,7 @@ export default {
 
 <template>
   <gl-button
-    v-gl-tooltip.hover.noninteractive.ds500="tooltip"
+    v-gl-tooltip.hover.ds500="tooltip"
     aria-controls="super-sidebar"
     :aria-expanded="ariaExpanded"
     :aria-label="$options.i18n.primaryNavigationSidebar"
diff --git a/app/assets/javascripts/super_sidebar/components/user_bar.vue b/app/assets/javascripts/super_sidebar/components/user_bar.vue
index 810b1d02046..5d94e71c5ab 100644
--- a/app/assets/javascripts/super_sidebar/components/user_bar.vue
+++ b/app/assets/javascripts/super_sidebar/components/user_bar.vue
@@ -139,7 +139,7 @@ export default {
 
       <gl-button
         v-if="isImpersonating"
-        v-gl-tooltip.noninteractive.ds500.bottom
+        v-gl-tooltip.ds500.bottom
         :href="sidebarData.stop_impersonation_path"
         :title="$options.i18n.stopImpersonating"
         :aria-label="$options.i18n.stopImpersonating"
@@ -154,7 +154,7 @@ export default {
       class="gl-display-flex gl-justify-content-space-between gl-gap-2"
     >
       <counter
-        v-gl-tooltip:super-sidebar.hover.noninteractive.ds500.bottom="$options.i18n.issues"
+        v-gl-tooltip:super-sidebar.hover.ds500.bottom="$options.i18n.issues"
         class="gl-flex-basis-third dashboard-shortcuts-issues"
         icon="issues"
         :count="userCounts.assigned_issues"
@@ -172,7 +172,7 @@ export default {
         @hidden="mrMenuShown = false"
       >
         <counter
-          v-gl-tooltip:super-sidebar.hover.noninteractive.ds500.bottom="
+          v-gl-tooltip:super-sidebar.hover.ds500.bottom="
             mrMenuShown ? '' : $options.i18n.mergeRequests
           "
           class="gl-w-full"
@@ -186,7 +186,7 @@ export default {
         />
       </merge-request-menu>
       <counter
-        v-gl-tooltip:super-sidebar.hover.noninteractive.ds500.bottom="$options.i18n.todoList"
+        v-gl-tooltip:super-sidebar.hover.ds500.bottom="$options.i18n.todoList"
         class="gl-flex-basis-third shortcuts-todos js-todos-count"
         icon="todo-done"
         :count="userCounts.todos"
@@ -200,7 +200,7 @@ export default {
     </div>
     <button
       id="super-sidebar-search"
-      v-gl-tooltip.bottom.hover.noninteractive.ds500.html="searchTooltip"
+      v-gl-tooltip.bottom.hover.ds500.html="searchTooltip"
       v-gl-modal="$options.SEARCH_MODAL_ID"
       class="counter gl-display-block gl-py-3 gl-bg-gray-10 gl-rounded-base gl-text-gray-900 gl-border-none gl-inset-border-1-gray-a-08 gl-line-height-1 gl-focus--focus gl-w-full"
       data-testid="super-sidebar-search-button"