diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/javascripts/ide/components/file_row_extra.vue | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
| download | gitlab-ce-13.6.0-rc42.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/assets/javascripts/ide/components/file_row_extra.vue')
| -rw-r--r-- | app/assets/javascripts/ide/components/file_row_extra.vue | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/components/file_row_extra.vue b/app/assets/javascripts/ide/components/file_row_extra.vue index 48ab58e1cb7..fb0d00dc6a1 100644 --- a/app/assets/javascripts/ide/components/file_row_extra.vue +++ b/app/assets/javascripts/ide/components/file_row_extra.vue @@ -1,8 +1,7 @@ <script> import { mapGetters } from 'vuex'; -import { GlIcon } from '@gitlab/ui'; +import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; import { n__ } from '~/locale'; -import tooltip from '~/vue_shared/directives/tooltip'; import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; import NewDropdown from './new_dropdown/index.vue'; import MrFileIcon from './mr_file_icon.vue'; @@ -10,7 +9,7 @@ import MrFileIcon from './mr_file_icon.vue'; export default { name: 'FileRowExtra', directives: { - tooltip, + GlTooltip: GlTooltipDirective, }, components: { GlIcon, @@ -70,7 +69,7 @@ export default { <span v-if="showTreeChangesCount" class="ide-tree-changes"> {{ changesCount }} <gl-icon - v-tooltip + v-gl-tooltip.left.viewport :title="folderChangesTooltip" :size="12" data-container="body" |