diff options
| author | Phil Hughes <me@iamphill.com> | 2018-10-31 15:34:15 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-31 15:34:15 +0000 |
| commit | ed816c3d996ea65abf4b8d6600a5988903b61b2d (patch) | |
| tree | c1cb6a924960db3274e71510dca900bc9c4faef0 /app/assets | |
| parent | 7a8fdd7287beb275394ef0854bf3df8abfe5a6b3 (diff) | |
| parent | 0179a562e6b523544056b07ef4efb6835598dcb8 (diff) | |
| download | gitlab-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')
| -rw-r--r-- | app/assets/javascripts/commons/gitlab_ui.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/pagination_links.vue | 4 |
2 files changed, 4 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); 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, |