summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-10-30 16:30:31 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-10-30 16:30:31 -0500
commit0179a562e6b523544056b07ef4efb6835598dcb8 (patch)
treea1973127e39e97dc504e7d4a921ca3cdf098adda
parent571e651b21c7a618b8686a4b3f8a8c09c87a37f5 (diff)
downloadgitlab-ce-0179a562e6b523544056b07ef4efb6835598dcb8.tar.gz
Remove gitlab-ui's pagination from globalgl-ui-pagination
-rw-r--r--app/assets/javascripts/commons/gitlab_ui.js2
-rw-r--r--app/assets/javascripts/vue_shared/components/pagination_links.vue4
-rw-r--r--changelogs/unreleased/gl-ui-pagination.yml5
3 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/commons/gitlab_ui.js b/app/assets/javascripts/commons/gitlab_ui.js
index f60665577fe..091117c6346 100644
--- a/app/assets/javascripts/commons/gitlab_ui.js
+++ b/app/assets/javascripts/commons/gitlab_ui.js
@@ -1,6 +1,5 @@
import Vue from 'vue';
import {
- GlPagination,
GlProgressBar,
GlModal,
GlLoadingIcon,
@@ -8,7 +7,6 @@ import {
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);
diff --git a/app/assets/javascripts/vue_shared/components/pagination_links.vue b/app/assets/javascripts/vue_shared/components/pagination_links.vue
index 1f2a679c145..89dcf049f6e 100644
--- a/app/assets/javascripts/vue_shared/components/pagination_links.vue
+++ b/app/assets/javascripts/vue_shared/components/pagination_links.vue
@@ -1,7 +1,11 @@
<script>
+import { GlPagination } from '@gitlab-org/gitlab-ui';
import { s__ } from '../../locale';
export default {
+ components: {
+ GlPagination,
+ },
props: {
change: {
type: Function,
diff --git a/changelogs/unreleased/gl-ui-pagination.yml b/changelogs/unreleased/gl-ui-pagination.yml
new file mode 100644
index 00000000000..cf73d6a1f8f
--- /dev/null
+++ b/changelogs/unreleased/gl-ui-pagination.yml
@@ -0,0 +1,5 @@
+---
+title: Remove gitlab-ui's pagination from global
+merge_request:
+author:
+type: performance