Merge branch 'fix-pipelines-pagination-is-gone' into 'master'

Renders pagination again for pipelines table

Closes #28299

See merge request !9315

2 files changed, 5 insertions, 2 deletions

diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
index 02ad029119d..dac364977d5 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
@@ -50,10 +50,13 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s
        *
        * If no scope is provided, 'all' is assumed.
        *
+       * Pagination component sends "null" when no scope is provided.
+       *
        * @param  {Number} pagenum
        * @param  {String} apiScope = 'all'
        */
-      change(pagenum, apiScope = 'all') {
+      change(pagenum, apiScope) {
+        if (!apiScope) apiScope = 'all';
         gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
       },
     },
diff --git a/app/assets/javascripts/vue_pipelines_index/store.js.es6 b/app/assets/javascripts/vue_pipelines_index/store.js.es6
index ffed5f53097..909007267b9 100644
--- a/app/assets/javascripts/vue_pipelines_index/store.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/store.js.es6
@@ -4,7 +4,7 @@
 ((gl) => {
   const pageValues = (headers) => {
     const normalized = gl.utils.normalizeHeaders(headers);
-    const paginationInfo = gl.utils.normalizeHeaders(normalized);
+    const paginationInfo = gl.utils.parseIntPagination(normalized);
     return paginationInfo;
   };