diff --git a/app/assets/javascripts/vue_pagination/index.js.es6 b/app/assets/javascripts/vue_pagination/index.js.es6
index 089f7ca0281..5f844ae8923 100644
--- a/app/assets/javascripts/vue_pagination/index.js.es6
+++ b/app/assets/javascripts/vue_pagination/index.js.es6
@@ -10,7 +10,7 @@
],
computed: {
last() {
- return Math.ceil(+this.count / 5);
+ return Math.ceil(+this.count / 30);
},
getItems() {
const total = +this.last;
diff --git a/app/assets/javascripts/vue_pipelines_index/branch_commit.js.es6 b/app/assets/javascripts/vue_pipelines_index/branch_commit.js.es6
index d41ff4d9b5b..d0459f2ae6b 100644
--- a/app/assets/javascripts/vue_pipelines_index/branch_commit.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/branch_commit.js.es6
@@ -9,7 +9,7 @@
return `mailto:${this.pipeline.commit.author_email}`;
},
alt() {
- return `${this.pipeline.commit.author_name}'s avatar`
+ return `${this.pipeline.commit.author_name}'s avatar`;
},
},
template: `
diff --git a/app/assets/javascripts/vue_pipelines_index/index.js.es6 b/app/assets/javascripts/vue_pipelines_index/index.js.es6
index f84d2eb44c3..3a7842f305b 100644
--- a/app/assets/javascripts/vue_pipelines_index/index.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/index.js.es6
@@ -25,7 +25,6 @@
el: '.vue-pipelines-index',
data: {
scope: project.dataset.url,
- count: project.dataset.count,
store: new gl.PipelineStore(),
},
components: {
@@ -36,7 +35,6 @@
diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
index e523105a7a5..4a3750be81a 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
@@ -20,12 +20,15 @@
currentPage: '',
intervalId: '',
pagenum: 1,
+ count: {
+ all: 0,
+ running_or_pending: 0,
+ },
};
},
props: [
'scope',
'store',
- 'count',
],
created() {
const url = window.location.toString();
@@ -65,9 +68,10 @@
diff --git a/app/assets/javascripts/vue_pipelines_index/store.js.es6 b/app/assets/javascripts/vue_pipelines_index/store.js.es6
index 66d9688a249..75796c936d7 100644
--- a/app/assets/javascripts/vue_pipelines_index/store.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/store.js.es6
@@ -8,8 +8,8 @@
this.$http.get(`${url}?page=${pageNum}`)
.then((response) => {
const res = JSON.parse(response.body);
- debugger
Vue.set(this, 'pipelines', res.pipelines);
+ Vue.set(this, 'count', res.count);
}, () => new Flash(
'Something went wrong on our end.'
));
diff --git a/app/assets/javascripts/vue_pipelines_status/pending.js.es6 b/app/assets/javascripts/vue_pipelines_status/pending.js.es6
index 30e430c1636..579c6f71a2e 100644
--- a/app/assets/javascripts/vue_pipelines_status/pending.js.es6
+++ b/app/assets/javascripts/vue_pipelines_status/pending.js.es6
@@ -20,4 +20,4 @@
`,
});
-})(window.gl || (window.gl = {}));
\ No newline at end of file
+})(window.gl || (window.gl = {}));
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 1515728c563..569219b7669 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -35,7 +35,7 @@
= link_to ci_lint_path, class: 'btn btn-default' do
%span CI Lint
- %div.content-list.pipelines{data: {url: namespace_project_pipelines_path(@project.namespace, @project, format: :json), "data-count": "#{@pipelines_count}"}}
+ %div.content-list.pipelines{data: {url: namespace_project_pipelines_path(@project.namespace, @project, format: :json)}}
- if @pipelines.blank?
%div
.nothing-here-block No pipelines to show