Merge branch '54282-tooltip-stuck' into 'master'

Fixes stuck tooltip on stop env button

Closes #53571 and #54282

See merge request gitlab-org/gitlab-ce!23244

2 files changed, 9 insertions, 4 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
index c0cf1b2f656..950347d8863 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
@@ -1,10 +1,10 @@
 <script>
+import { GlTooltipDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
 import FilteredSearchDropdown from '~/vue_shared/components/filtered_search_dropdown.vue';
 import { __ } from '~/locale';
 import timeagoMixin from '../../vue_shared/mixins/timeago';
-import tooltip from '../../vue_shared/directives/tooltip';
 import LoadingButton from '../../vue_shared/components/loading_button.vue';
 import { visitUrl } from '../../lib/utils/url_utility';
 import createFlash from '../../flash';
@@ -25,7 +25,7 @@ export default {
     ReviewAppLink,
   },
   directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
   },
   mixins: [timeagoMixin],
   props: {
@@ -136,7 +136,7 @@ export default {
             </template>
             <span
               v-if="hasDeploymentTime"
-              v-tooltip
+              v-gl-tooltip
               :title="deployment.deployed_at_formatted"
               class="js-deploy-time"
             >
@@ -189,7 +189,7 @@ export default {
             </template>
             <span
               v-if="deployment.stop_url"
-              v-tooltip
+              v-gl-tooltip
               :title="deployInProgressTooltip"
               class="d-inline-block"
               tabindex="0"
diff --git a/changelogs/unreleased/54282-tooltip-stuck.yml b/changelogs/unreleased/54282-tooltip-stuck.yml
new file mode 100644
index 00000000000..655870499a0
--- /dev/null
+++ b/changelogs/unreleased/54282-tooltip-stuck.yml
@@ -0,0 +1,5 @@
+---
+title: Fixes stuck tooltip on stop env button
+merge_request: 23244
+author:
+type: fixed