diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-10-31 16:01:59 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-10-31 16:01:59 +0000 |
| commit | 0336dc438b6faab575df996364076b57e388cc27 (patch) | |
| tree | 4ad74e39c8479f5caa9c490aec9d7a539ecbebde /app/assets | |
| parent | 76f41a5de8a8281830fca4fba397486ac227b9a1 (diff) | |
| parent | ed816c3d996ea65abf4b8d6600a5988903b61b2d (diff) | |
| download | gitlab-ce-0336dc438b6faab575df996364076b57e388cc27.tar.gz | |
Merge branch 'master' into 'gl-ui-progress-bar'
# Conflicts:
# app/assets/javascripts/commons/gitlab_ui.js
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 36e6a18b843..ba43832aa55 100644 --- a/app/assets/javascripts/commons/gitlab_ui.js +++ b/app/assets/javascripts/commons/gitlab_ui.js @@ -1,11 +1,9 @@ import Vue from 'vue'; import { - GlPagination, GlLoadingIcon, GlTooltipDirective, } from '@gitlab-org/gitlab-ui'; -Vue.component('gl-pagination', GlPagination); Vue.component('gl-loading-icon', GlLoadingIcon); Vue.directive('gl-tooltip', GlTooltipDirective); 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, |