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> <script>
import { GlTooltipDirective } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
import FilteredSearchDropdown from '~/vue_shared/components/filtered_search_dropdown.vue'; import FilteredSearchDropdown from '~/vue_shared/components/filtered_search_dropdown.vue';
import { __ } from '~/locale'; import { __ } from '~/locale';
import timeagoMixin from '../../vue_shared/mixins/timeago'; import timeagoMixin from '../../vue_shared/mixins/timeago';
import tooltip from '../../vue_shared/directives/tooltip';
import LoadingButton from '../../vue_shared/components/loading_button.vue'; import LoadingButton from '../../vue_shared/components/loading_button.vue';
import { visitUrl } from '../../lib/utils/url_utility'; import { visitUrl } from '../../lib/utils/url_utility';
import createFlash from '../../flash'; import createFlash from '../../flash';
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
ReviewAppLink, ReviewAppLink,
}, },
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
mixins: [timeagoMixin], mixins: [timeagoMixin],
props: { props: {
...@@ -136,7 +136,7 @@ export default { ...@@ -136,7 +136,7 @@ export default {
</template> </template>
<span <span
v-if="hasDeploymentTime" v-if="hasDeploymentTime"
v-tooltip v-gl-tooltip
:title="deployment.deployed_at_formatted" :title="deployment.deployed_at_formatted"
class="js-deploy-time" class="js-deploy-time"
> >
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
</template> </template>
<span <span
v-if="deployment.stop_url" v-if="deployment.stop_url"
v-tooltip v-gl-tooltip
:title="deployInProgressTooltip" :title="deployInProgressTooltip"
class="d-inline-block" class="d-inline-block"
tabindex="0" 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