diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-03 00:10:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-03 00:10:43 +0300 |
commit | a961982252b5e33af6d7de358fbae28cb8cfd104 (patch) | |
tree | c8cb5fa18814881e76fa2c757855ba832f9e49f3 /app/assets/javascripts/mr_popover | |
parent | 4e06ca9e7d67aee59d691a363dabba46d53d34ba (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/mr_popover')
-rw-r--r-- | app/assets/javascripts/mr_popover/components/mr_popover.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/mr_popover/components/mr_popover.vue b/app/assets/javascripts/mr_popover/components/mr_popover.vue index e6bf7a6ec02..bf810978648 100644 --- a/app/assets/javascripts/mr_popover/components/mr_popover.vue +++ b/app/assets/javascripts/mr_popover/components/mr_popover.vue @@ -1,6 +1,6 @@ <script> /* eslint-disable @gitlab/vue-require-i18n-strings */ -import { GlPopover, GlSkeletonLoading } from '@gitlab/ui'; +import { GlPopover, GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui'; import CiIcon from '../../vue_shared/components/ci_icon.vue'; import timeagoMixin from '../../vue_shared/mixins/timeago'; import query from '../queries/merge_request.query.graphql'; |