summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-09-26 21:00:52 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-09-26 21:00:52 +0000
commit44311357c12eeb174f6977d4c385522cf82f6c55 (patch)
tree0f032adb47cc46c5c77d62fc0374a6af0adec9c4
parent40bf046081f920c63ef5d5fa28658ea1ffb0ebd3 (diff)
parent11e0a019b69d1ea21ac52599c3bf2f49d42cd4d8 (diff)
downloadgitlab-ce-44311357c12eeb174f6977d4c385522cf82f6c55.tar.gz
Merge branch 'jivl-fix-missing-import-skeleton-notes' into 'master'
Fix import statement for the skeleton notes See merge request gitlab-org/gitlab-ce!21940
-rw-r--r--app/assets/javascripts/notes.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index e2f485e37eb..f301f093ef4 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -16,7 +16,7 @@ import 'vendor/jquery.atwho';
import AjaxCache from '~/lib/utils/ajax_cache';
import Vue from 'vue';
import syntaxHighlight from '~/syntax_highlight';
-import SkeletonLoading from '@gitlab-org/gitlab-ui/dist/components/base/skeleton_loading';
+import { SkeletonLoading } from '@gitlab-org/gitlab-ui';
import axios from './lib/utils/axios_utils';
import { getLocationHash } from './lib/utils/url_utility';
import Flash from './flash';