diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-09-25 23:03:40 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-09-25 23:03:40 +0300 |
commit | 336cc5e7de3cea4b53db7bb653f8a149cfc4bb4e (patch) | |
tree | 72120c5c42eb70a1a1bb5e25ed77da89c4ac841c /app/assets/javascripts/notes/components/diff_with_note.vue | |
parent | 53e012a9c5a66d18c1bc5ba82cb205e3bc5eb3b4 (diff) | |
parent | 2a6cd526acef109153be3f12571882a8e4d1cc89 (diff) |
Merge branch 'add-gitlab-ui-skeleton-loading' into 'master'
Add gitlab-ui skeleton loading
See merge request gitlab-org/gitlab-ce!21871
Diffstat (limited to 'app/assets/javascripts/notes/components/diff_with_note.vue')
-rw-r--r-- | app/assets/javascripts/notes/components/diff_with_note.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/diff_with_note.vue b/app/assets/javascripts/notes/components/diff_with_note.vue index 802be022ba6..d9161210fe6 100644 --- a/app/assets/javascripts/notes/components/diff_with_note.vue +++ b/app/assets/javascripts/notes/components/diff_with_note.vue @@ -3,13 +3,13 @@ import { mapState, mapActions } from 'vuex'; import imageDiffHelper from '~/image_diff/helpers/index'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import DiffFileHeader from '~/diffs/components/diff_file_header.vue'; -import SkeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue'; +import SkeletonLoading from '@gitlab-org/gitlab-ui/dist/components/base/skeleton_loading'; import { trimFirstCharOfLineContent } from '~/diffs/store/utils'; export default { components: { DiffFileHeader, - SkeletonLoadingContainer, + SkeletonLoading, }, props: { discussion: { @@ -142,7 +142,7 @@ export default { class="line_content js-success-lazy-load" > <span></span> - <skeleton-loading-container /> + <skeleton-loading /> <span></span> </td> </tr> |