diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-12 12:08:38 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-12 12:08:38 +0300 |
commit | 5abf26a68f1b5a61d601bf58d8215f1e92809b21 (patch) | |
tree | 702c693eba41eea6564f32f39c109f18e07de497 /app/assets/javascripts/environments | |
parent | a1e664d4cc1edc8e5d6bd4a838e5e6a7426cc0f6 (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_actions.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/environments/components/environment_actions.vue b/app/assets/javascripts/environments/components/environment_actions.vue index 035b276bc3b..bc35a07fe4a 100644 --- a/app/assets/javascripts/environments/components/environment_actions.vue +++ b/app/assets/javascripts/environments/components/environment_actions.vue @@ -1,13 +1,12 @@ <script> -import { GlButton, GlIcon, GlLoadingIcon } from '@gitlab/ui'; +import { GlButton, GlIcon, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui'; import { __, s__, sprintf } from '~/locale'; import { formatTime } from '~/lib/utils/datetime_utility'; import eventHub from '../event_hub'; -import tooltip from '../../vue_shared/directives/tooltip'; export default { directives: { - tooltip, + GlTooltip: GlTooltipDirective, }, components: { GlButton, @@ -70,13 +69,14 @@ export default { <template> <div class="btn-group" role="group"> <gl-button - v-tooltip + v-gl-tooltip :title="title" :aria-label="title" :disabled="isLoading" class="dropdown dropdown-new js-environment-actions-dropdown" data-container="body" data-toggle="dropdown" + data-testid="environment-actions-button" > <span> <gl-icon name="play" /> |