diff options
author | Phil Hughes <me@iamphill.com> | 2019-06-12 14:51:40 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-06-12 14:51:40 +0300 |
commit | c407788626e918bcf9d233ed081df94a35586ab9 (patch) | |
tree | 804ccf5731a339434548d9912a258e23959405f7 | |
parent | 9eb40fbfd63799a1cbdb219b4b9ff7a1fa8d6430 (diff) | |
parent | 442dce052a11600689597da932970e05439cc4a9 (diff) |
Merge branch '62788-clean-up-pagination' into 'master'
Moves table pagination component
Closes #62788
See merge request gitlab-org/gitlab-ce!29543
-rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_table.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/environments/components/container.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/environments/mixins/environments_mixin.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/registry/components/table_registry.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/pagination/table_pagination.vue (renamed from app/assets/javascripts/vue_shared/components/table_pagination.vue) | 0 | ||||
-rw-r--r-- | changelogs/unreleased/62788-clean-up-pagination.yml | 5 | ||||
-rw-r--r-- | spec/javascripts/vue_shared/components/table_pagination_spec.js | 2 |
8 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.vue b/app/assets/javascripts/commit/pipelines/pipelines_table.vue index 3e01841d563..4890f99e9d1 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.vue +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.vue @@ -2,7 +2,7 @@ import PipelinesService from '../../pipelines/services/pipelines_service'; import PipelineStore from '../../pipelines/stores/pipelines_store'; import pipelinesMixin from '../../pipelines/mixins/pipelines'; -import TablePagination from '../../vue_shared/components/table_pagination.vue'; +import TablePagination from '../../vue_shared/components/pagination/table_pagination.vue'; import { getParameterByName } from '../../lib/utils/common_utils'; import CIPaginationMixin from '../../vue_shared/mixins/ci_pagination_api_mixin'; diff --git a/app/assets/javascripts/environments/components/container.vue b/app/assets/javascripts/environments/components/container.vue index be80661223c..f8a637138ad 100644 --- a/app/assets/javascripts/environments/components/container.vue +++ b/app/assets/javascripts/environments/components/container.vue @@ -1,6 +1,6 @@ <script> import { GlLoadingIcon } from '@gitlab/ui'; -import TablePagination from '~/vue_shared/components/table_pagination.vue'; +import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import containerMixin from 'ee_else_ce/environments/mixins/container_mixin'; import EnvironmentTable from '../components/environments_table.vue'; diff --git a/app/assets/javascripts/environments/mixins/environments_mixin.js b/app/assets/javascripts/environments/mixins/environments_mixin.js index a5812b173dc..31347d95a25 100644 --- a/app/assets/javascripts/environments/mixins/environments_mixin.js +++ b/app/assets/javascripts/environments/mixins/environments_mixin.js @@ -11,7 +11,7 @@ import Flash from '../../flash'; import eventHub from '../event_hub'; import EnvironmentsService from '../services/environments_service'; -import tablePagination from '../../vue_shared/components/table_pagination.vue'; +import tablePagination from '../../vue_shared/components/pagination/table_pagination.vue'; import environmentTable from '../components/environments_table.vue'; import tabs from '../../vue_shared/components/navigation_tabs.vue'; import container from '../components/container.vue'; diff --git a/app/assets/javascripts/pipelines/components/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines.vue index 9dcea557b32..d730ef41b1a 100644 --- a/app/assets/javascripts/pipelines/components/pipelines.vue +++ b/app/assets/javascripts/pipelines/components/pipelines.vue @@ -4,7 +4,7 @@ import { __, sprintf, s__ } from '../../locale'; import createFlash from '../../flash'; import PipelinesService from '../services/pipelines_service'; import pipelinesMixin from '../mixins/pipelines'; -import TablePagination from '../../vue_shared/components/table_pagination.vue'; +import TablePagination from '../../vue_shared/components/pagination/table_pagination.vue'; import NavigationTabs from '../../vue_shared/components/navigation_tabs.vue'; import NavigationControls from './nav_controls.vue'; import { getParameterByName } from '../../lib/utils/common_utils'; diff --git a/app/assets/javascripts/registry/components/table_registry.vue b/app/assets/javascripts/registry/components/table_registry.vue index 81fe0a48c06..1e4dfe76b26 100644 --- a/app/assets/javascripts/registry/components/table_registry.vue +++ b/app/assets/javascripts/registry/components/table_registry.vue @@ -4,7 +4,7 @@ import { GlButton, GlTooltipDirective } from '@gitlab/ui'; import { n__ } from '../../locale'; import createFlash from '../../flash'; import ClipboardButton from '../../vue_shared/components/clipboard_button.vue'; -import TablePagination from '../../vue_shared/components/table_pagination.vue'; +import TablePagination from '../../vue_shared/components/pagination/table_pagination.vue'; import Icon from '../../vue_shared/components/icon.vue'; import timeagoMixin from '../../vue_shared/mixins/timeago'; import { errorMessages, errorMessagesTypes } from '../constants'; diff --git a/app/assets/javascripts/vue_shared/components/table_pagination.vue b/app/assets/javascripts/vue_shared/components/pagination/table_pagination.vue index 1e2d4ffa7e3..1e2d4ffa7e3 100644 --- a/app/assets/javascripts/vue_shared/components/table_pagination.vue +++ b/app/assets/javascripts/vue_shared/components/pagination/table_pagination.vue diff --git a/changelogs/unreleased/62788-clean-up-pagination.yml b/changelogs/unreleased/62788-clean-up-pagination.yml new file mode 100644 index 00000000000..05e3a4527b8 --- /dev/null +++ b/changelogs/unreleased/62788-clean-up-pagination.yml @@ -0,0 +1,5 @@ +--- +title: Moves the table pagination shared component +merge_request: +author: +type: other diff --git a/spec/javascripts/vue_shared/components/table_pagination_spec.js b/spec/javascripts/vue_shared/components/table_pagination_spec.js index 42cd41381dc..42abb4d83f0 100644 --- a/spec/javascripts/vue_shared/components/table_pagination_spec.js +++ b/spec/javascripts/vue_shared/components/table_pagination_spec.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import paginationComp from '~/vue_shared/components/table_pagination.vue'; +import paginationComp from '~/vue_shared/components/pagination/table_pagination.vue'; describe('Pagination component', () => { let component; |