Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 0 deletions

diff --git a/app/assets/javascripts/vue_shared/components/pagination_bar/pagination_bar.vue b/app/assets/javascripts/vue_shared/components/pagination_bar/pagination_bar.vue
index b4d565991f5..c1246b2bf44 100644
--- a/app/assets/javascripts/vue_shared/components/pagination_bar/pagination_bar.vue
+++ b/app/assets/javascripts/vue_shared/components/pagination_bar/pagination_bar.vue
@@ -2,6 +2,7 @@
 import { GlDropdown, GlDropdownItem, GlIcon, GlSprintf } from '@gitlab/ui';
 import { __ } from '~/locale';
 import PaginationLinks from '~/vue_shared/components/pagination_links.vue';
+import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
 
 const DEFAULT_PAGE_SIZES = [20, 50, 100];
 
@@ -12,6 +13,7 @@ export default {
     GlDropdownItem,
     GlIcon,
     GlSprintf,
+    LocalStorageSync,
   },
   props: {
     pageInfo: {
@@ -23,6 +25,11 @@ export default {
       type: Array,
       default: () => DEFAULT_PAGE_SIZES,
     },
+    storageKey: {
+      required: false,
+      type: String,
+      default: null,
+    },
   },
 
   computed: {
@@ -66,6 +73,12 @@ export default {
 
 <template>
   <div class="gl-display-flex gl-align-items-center">
+    <local-storage-sync
+      v-if="storageKey"
+      :storage-key="storageKey"
+      :value="pageInfo.perPage"
+      @input="setPageSize"
+    />
     <pagination-links :change="setPage" :page-info="pageInfo" class="gl-m-0" />
     <gl-dropdown category="tertiary" class="gl-ml-auto" data-testid="page-size">
       <template #button-content>