summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/commons
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-10-31 15:34:15 +0000
committerPhil Hughes <me@iamphill.com>2018-10-31 15:34:15 +0000
commited816c3d996ea65abf4b8d6600a5988903b61b2d (patch)
treec1cb6a924960db3274e71510dca900bc9c4faef0 /app/assets/javascripts/commons
parent7a8fdd7287beb275394ef0854bf3df8abfe5a6b3 (diff)
parent0179a562e6b523544056b07ef4efb6835598dcb8 (diff)
downloadgitlab-ce-ed816c3d996ea65abf4b8d6600a5988903b61b2d.tar.gz
Merge branch 'gl-ui-pagination' into 'master'
Remove gitlab-ui's pagination from global See merge request gitlab-org/gitlab-ce!22704
Diffstat (limited to 'app/assets/javascripts/commons')
-rw-r--r--app/assets/javascripts/commons/gitlab_ui.js2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/assets/javascripts/commons/gitlab_ui.js b/app/assets/javascripts/commons/gitlab_ui.js
index 64a748d29db..fe551480167 100644
--- a/app/assets/javascripts/commons/gitlab_ui.js
+++ b/app/assets/javascripts/commons/gitlab_ui.js
@@ -1,12 +1,10 @@
import Vue from 'vue';
import {
- GlPagination,
GlProgressBar,
GlLoadingIcon,
GlTooltipDirective,
} from '@gitlab-org/gitlab-ui';
-Vue.component('gl-pagination', GlPagination);
Vue.component('gl-progress-bar', GlProgressBar);
Vue.component('gl-loading-icon', GlLoadingIcon);