summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/commons
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-11-02 09:02:52 +0100
committerJan Provaznik <jprovaznik@gitlab.com>2018-11-02 09:02:52 +0100
commitf4023a69cb5e78fca595a2151a2272fbdfd5917a (patch)
tree12bfc6bc746b80a1099431dccb8df0fcb30ad0fc /app/assets/javascripts/commons
parent79911cb4ddc8724cc2270570261e807a8cf7eb60 (diff)
parenta0ca86e5a3777bc4800fc96765d8536091671ef3 (diff)
downloadgitlab-ce-f4023a69cb5e78fca595a2151a2272fbdfd5917a.tar.gz
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'app/assets/javascripts/commons')
-rw-r--r--app/assets/javascripts/commons/gitlab_ui.js12
1 files changed, 1 insertions, 11 deletions
diff --git a/app/assets/javascripts/commons/gitlab_ui.js b/app/assets/javascripts/commons/gitlab_ui.js
index f60665577fe..e93e1f5ea2c 100644
--- a/app/assets/javascripts/commons/gitlab_ui.js
+++ b/app/assets/javascripts/commons/gitlab_ui.js
@@ -1,17 +1,7 @@
import Vue from 'vue';
-import {
- GlPagination,
- GlProgressBar,
- GlModal,
- GlLoadingIcon,
- GlModalDirective,
- GlTooltipDirective,
-} from '@gitlab-org/gitlab-ui';
+import { GlProgressBar, GlLoadingIcon, GlTooltipDirective } from '@gitlab-org/gitlab-ui';
-Vue.component('gl-pagination', GlPagination);
Vue.component('gl-progress-bar', GlProgressBar);
-Vue.component('gl-ui-modal', GlModal);
Vue.component('gl-loading-icon', GlLoadingIcon);
-Vue.directive('gl-modal', GlModalDirective);
Vue.directive('gl-tooltip', GlTooltipDirective);