Commit 74e18035 authored by Phil Hughes's avatar Phil Hughes

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
parents 6a12e9d1 d55650f0
<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"
......
---
title: Fixes stuck tooltip on stop env button
merge_request: 23244
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment