diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-06 00:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-06 00:08:47 +0300 |
| commit | 3ef453aa1cf8cc5f90a728fa3ebc166090ff2e3e (patch) | |
| tree | cfb343b2edfd02650e912e1b8f438a0e6a00a2d8 /app/assets/javascripts/environments | |
| parent | ec18750aa8538712b952b8265581fc3b3e037923 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/environments')
| -rw-r--r-- | app/assets/javascripts/environments/components/environment_stop.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/environments/components/environment_stop.vue b/app/assets/javascripts/environments/components/environment_stop.vue index c63d54d586d..ff74f81c98e 100644 --- a/app/assets/javascripts/environments/components/environment_stop.vue +++ b/app/assets/javascripts/environments/components/environment_stop.vue @@ -4,7 +4,6 @@ * Used in environments table. */ -import $ from 'jquery'; import { GlTooltipDirective, GlButton } from '@gitlab/ui'; import { s__ } from '~/locale'; import eventHub from '../event_hub'; @@ -40,7 +39,7 @@ export default { }, methods: { onClick() { - $(this.$el).tooltip('dispose'); + this.$root.$emit('bv::hide::tooltip', this.$options.stopEnvironmentTooltipId); eventHub.$emit('requestStopEnvironment', this.environment); }, onStopEnvironment(environment) { @@ -49,11 +48,12 @@ export default { } }, }, + stopEnvironmentTooltipId: 'stop-environment-button-tooltip', }; </script> <template> <gl-button - v-gl-tooltip + v-gl-tooltip="{ id: $options.stopEnvironmentTooltipId }" :loading="isLoading" :title="title" :aria-label="title" |