diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 09:08:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 09:08:58 +0000 |
| commit | 93e4425400aa60f54f1bbccb26ef6581503952f3 (patch) | |
| tree | 60ec09e58a7ba58d3d795ddc12803d40471b758d /app/assets/javascripts/vue_merge_request_widget | |
| parent | 731d58455c61ad6400924171eb182f2c2ab2f0a4 (diff) | |
| download | gitlab-ce-93e4425400aa60f54f1bbccb26ef6581503952f3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue b/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue index 859f2c57598..c917b69953f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue @@ -1,6 +1,5 @@ <script> -import { GlIcon, GlSprintf } from '@gitlab/ui'; -import tooltip from '../../vue_shared/directives/tooltip'; +import { GlIcon, GlSprintf, GlTooltipDirective } from '@gitlab/ui'; import { __ } from '../../locale'; export default { @@ -13,7 +12,7 @@ export default { GlSprintf, }, directives: { - tooltip, + GlTooltip: GlTooltipDirective, }, }; </script> @@ -28,7 +27,7 @@ export default { </gl-sprintf> </span> <gl-icon - v-tooltip + v-gl-tooltip.hover :title="$options.i18n.tooltipTitle" :aria-label="$options.i18n.tooltipTitle" name="question-o" |