Merge branch 'pipelines_missing_pagination' into 'master'

fix pagination component handling different header styles from different server proxies

See merge request !8569

app/assets/javascripts/vue_pipelines_index/index.js.es6

 /* global Vue, VueResource, gl */
 /*= require vue_common_component/commit */
+/*= require vue_pagination/index */
 /*= require vue-resource
 /*= require boards/vue_resource_interceptor */
 /*= require ./status.js.es6 */

app/assets/javascripts/vue_pipelines_index/store.js.es6

@@ -3,15 +3,25 @@
 /*= require vue_realtime_listener/index.js */
 
 ((gl) => {
-  const pageValues = headers => ({
-    perPage: +headers['X-Per-Page'],
-    page: +headers['X-Page'],
-    total: +headers['X-Total'],
-    totalPages: +headers['X-Total-Pages'],
-    nextPage: +headers['X-Next-Page'],
-    previousPage: +headers['X-Prev-Page'],
+  const pageValues = (headers) => {
+    const normalizedHeaders = {};
+
+    Object.keys(headers).forEach((e) => {
+      normalizedHeaders[e.toUpperCase()] = headers[e];
     });
 
+    const paginationInfo = {
+      perPage: +normalizedHeaders['X-PER-PAGE'],
+      page: +normalizedHeaders['X-PAGE'],
+      total: +normalizedHeaders['X-TOTAL'],
+      totalPages: +normalizedHeaders['X-TOTAL-PAGES'],
+      nextPage: +normalizedHeaders['X-NEXT-PAGE'],
+      previousPage: +normalizedHeaders['X-PREV-PAGE'],
+    };
+
+    return paginationInfo;
+  };
+
   gl.PipelineStore = class {
     fetchDataLoop(Vue, pageNum, url, apiScope) {
       const updatePipelineNums = (count) => {

app/views/projects/pipelines/index.html.haml

@@ -64,5 +64,4 @@
 
       .vue-pipelines-index
 
-= page_specific_javascript_tag('vue_pagination/index.js')
 = page_specific_javascript_tag('vue_pipelines_index/index.js')

config/application.rb

@@ -111,7 +111,6 @@ module Gitlab
     config.assets.precompile << "lib/*.js"
     config.assets.precompile << "u2f.js"
     config.assets.precompile << "vue_pipelines_index/index.js"
-    config.assets.precompile << "vue_pagination/index.js"
     config.assets.precompile << "vendor/assets/fonts/*"
 
     # Version of your assets, change this if you want to expire all your assets