diff options
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/content_viewer/viewers')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue | 7 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue index 3bf629d4acb..f9d3d76e7f5 100644 --- a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue @@ -1,12 +1,11 @@ <script> -import { GlLink } from '@gitlab/ui'; -import Icon from '../../icon.vue'; +import { GlLink, GlIcon } from '@gitlab/ui'; import { numberToHumanSize } from '../../../../lib/utils/number_utils'; export default { components: { GlLink, - Icon, + GlIcon, }, props: { path: { @@ -52,7 +51,7 @@ export default { :download="fileName" target="_blank" > - <icon :size="16" name="download" class="float-left gl-mr-3" /> + <gl-icon :size="16" name="download" class="float-left gl-mr-3" /> {{ __('Download') }} </gl-link> </div> diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue index f9b678e33cd..6bb05e59f6b 100644 --- a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue @@ -1,8 +1,9 @@ <script> +/* eslint-disable vue/no-v-html */ import $ from 'jquery'; import '~/behaviors/markdown/render_gfm'; -import { GlSkeletonLoading } from '@gitlab/ui'; +import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui'; import { forEach, escape } from 'lodash'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; |