Commit 0c835170 authored by Regis's avatar Regis

Merge branch 'alhpa-piplines' into auto-pipelines-vue

parents 8012abf4 f2e64fdd
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
return new Vue({ return new Vue({
el: '.vue-pipelines-index', el: '.vue-pipelines-index',
data: { data: {
scope: project.dataset.projectId, scope: project.dataset.url,
count: project.dataset.count, count: project.dataset.count,
store: new gl.PipelineStore(), store: new gl.PipelineStore(),
}, },
......
...@@ -8,8 +8,10 @@ ...@@ -8,8 +8,10 @@
gl.PipelineStore = class { gl.PipelineStore = class {
fetchDataLoop(Vue, pageNum) { fetchDataLoop(Vue, pageNum) {
const goFetch = () => const goFetch = () =>
this.$http.get(`${api}/${this.scope}/pipelines${paginate}${pageNum}`) // const url = `${api}/${this.scope}/pipelines${paginate}${pageNum}`
this.$http.get('/gitlab-org/gitlab-shell/pipelines.json?page=1')
.then((response) => { .then((response) => {
debugger
Vue.set(this, 'pipelines', JSON.parse(response.body)); Vue.set(this, 'pipelines', JSON.parse(response.body));
}, () => new Flash( }, () => new Flash(
'Something went wrong on our end.' 'Something went wrong on our end.'
......
...@@ -35,8 +35,7 @@ ...@@ -35,8 +35,7 @@
= link_to ci_lint_path, class: 'btn btn-default' do = link_to ci_lint_path, class: 'btn btn-default' do
%span CI Lint %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-project-id": "#{@project.id}", "data-count": "#{@pipelines_count}"}
- if @pipelines.blank? - if @pipelines.blank?
%div %div
.nothing-here-block No pipelines to show .nothing-here-block No pipelines to show
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment