Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 4 deletions

diff --git a/app/assets/javascripts/related_issues/components/issue_token.vue b/app/assets/javascripts/related_issues/components/issue_token.vue
index bbbdf2cdb49..7f12c10f6a1 100644
--- a/app/assets/javascripts/related_issues/components/issue_token.vue
+++ b/app/assets/javascripts/related_issues/components/issue_token.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlIcon } from '@gitlab/ui';
+import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
 import relatedIssuableMixin from '~/vue_shared/mixins/related_issuable_mixin';
 
@@ -8,6 +8,9 @@ export default {
   components: {
     GlIcon,
   },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
   mixins: [relatedIssuableMixin],
   props: {
     isCondensed: {
@@ -52,7 +55,7 @@ export default {
     <component
       :is="computedLinkElementType"
       ref="link"
-      v-tooltip
+      v-gl-tooltip
       :class="{
         'issue-token-link': isCondensed,
         'issuable-main-info': !isCondensed,
@@ -84,7 +87,7 @@ export default {
       >
         <gl-icon
           v-if="hasState"
-          v-tooltip
+          v-gl-tooltip
           :class="iconClass"
           :name="iconName"
           :size="12"
@@ -98,7 +101,7 @@ export default {
     <button
       v-if="canRemove"
       ref="removeButton"
-      v-tooltip
+      v-gl-tooltip
       :class="{
         'issue-token-remove-button': isCondensed,
         'btn btn-default': !isCondensed,