diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 15:10:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 15:10:11 +0000 |
| commit | 27622f7417713cbd2057a7f642e9ce128d9fc169 (patch) | |
| tree | a3d4f20076d48d61c5bbd92e2ae895bb069fe92a /app/assets/javascripts/ide/components/mr_file_icon.vue | |
| parent | 4b9bde7848d9538c1635ffe7a5385ba013487b4a (diff) | |
| download | gitlab-ce-27622f7417713cbd2057a7f642e9ce128d9fc169.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide/components/mr_file_icon.vue')
| -rw-r--r-- | app/assets/javascripts/ide/components/mr_file_icon.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/ide/components/mr_file_icon.vue b/app/assets/javascripts/ide/components/mr_file_icon.vue index 4fab57b6f3e..c8629a869e0 100644 --- a/app/assets/javascripts/ide/components/mr_file_icon.vue +++ b/app/assets/javascripts/ide/components/mr_file_icon.vue @@ -1,10 +1,10 @@ <script> -import icon from '~/vue_shared/components/icon.vue'; +import { GlIcon } from '@gitlab/ui'; import tooltip from '~/vue_shared/directives/tooltip'; export default { components: { - icon, + GlIcon, }, directives: { tooltip, @@ -13,7 +13,7 @@ export default { </script> <template> - <icon + <gl-icon v-tooltip :title="__('Part of merge request changes')" :size="12" |