Commit 1439b9b8 authored by Regis's avatar Regis

can grab commits prior to pipelines - might need more custom API

parent 23b9a99f
...@@ -4,5 +4,4 @@ ...@@ -4,5 +4,4 @@
//= require ./store.js.es6 //= require ./store.js.es6
//= require ./running_icon.vue.js.es6 //= require ./running_icon.vue.js.es6
//= require ./running.vue.js.es6 //= require ./running.vue.js.es6
//= require ./status_data_icons.js.es6
//= require ./pipelines.vue.js.es6 //= require ./pipelines.vue.js.es6
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
data() { data() {
return { return {
pipelines: [], pipelines: [],
runnerStats: new gl.RunnerStats(), commits: [],
}; };
}, },
props: [ props: [
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
'store', 'store',
], ],
created() { created() {
this.store.fetchCommits.call(this, Vue);
this.store.fetchDataLoop.call(this, Vue); this.store.fetchDataLoop.call(this, Vue);
}, },
methods: { methods: {
...@@ -57,10 +58,28 @@ ...@@ -57,10 +58,28 @@
<path fill="#8F8F8F" fill-rule="evenodd" d="M28.7769836,18 C27.8675252,13.9920226 24.2831748,11 20,11 C15.7168252,11 12.1324748,13.9920226 11.2230164,18 L4.0085302,18 C2.90195036,18 2,18.8954305 2,20 C2,21.1122704 2.8992496,22 4.0085302,22 L11.2230164,22 C12.1324748,26.0079774 15.7168252,29 20,29 C24.2831748,29 27.8675252,26.0079774 28.7769836,22 L35.9914698,22 C37.0980496,22 38,21.1045695 38,20 C38,18.8877296 37.1007504,18 35.9914698,18 L28.7769836,18 L28.7769836,18 Z M20,25 C22.7614237,25 25,22.7614237 25,20 C25,17.2385763 22.7614237,15 20,15 C17.2385763,15 15,17.2385763 15,20 C15,22.7614237 17.2385763,25 20,25 L20,25 Z"></path> <path fill="#8F8F8F" fill-rule="evenodd" d="M28.7769836,18 C27.8675252,13.9920226 24.2831748,11 20,11 C15.7168252,11 12.1324748,13.9920226 11.2230164,18 L4.0085302,18 C2.90195036,18 2,18.8954305 2,20 C2,21.1122704 2.8992496,22 4.0085302,22 L11.2230164,22 C12.1324748,26.0079774 15.7168252,29 20,29 C24.2831748,29 27.8675252,26.0079774 28.7769836,22 L35.9914698,22 C37.0980496,22 38,21.1045695 38,20 C38,18.8877296 37.1007504,18 35.9914698,18 L28.7769836,18 L28.7769836,18 Z M20,25 C22.7614237,25 25,22.7614237 25,20 C25,17.2385763 22.7614237,15 20,15 C17.2385763,15 15,17.2385763 15,20 C15,22.7614237 17.2385763,25 20,25 L20,25 Z"></path>
</svg> </svg>
</div> </div>
<a class="commit-id monospace" href="/gitlab-org/gitlab-ce/commit/29141ed3ea6157a60d9748921782015626a17f9e">{{shortSha(pipeline)}}</a> <a
class="commit-id monospace"
href="/gitlab-org/gitlab-ce/commit/{{pipeline.sha}}">{{shortSha(pipeline)}}
</a>
<p class="commit-title"> <p class="commit-title">
<a href="mailto:james@jameslopez.es"><img class="avatar has-tooltip s20 hidden-xs" alt="James Lopez's avatar" title="James Lopez" data-container="body" src="http://www.gravatar.com/avatar/80d3b651b4be1f1db39435c2d11f1f23?s=40&amp;d=identicon"></a> <a
<a class="commit-row-message" href="/gitlab-org/gitlab-ce/commit/29141ed3ea6157a60d9748921782015626a17f9e">fix broken repo 500 errors in UI and added relevant specs</a> href="mailto:james@jameslopez.es"
>
<img
class="avatar has-tooltip s20 hidden-xs"
alt="James Lopez's avatar"
title="James Lopez"
data-container="body"
src="http://www.gravatar.com/avatar/80d3b651b4be1f1db39435c2d11f1f23?s=40&amp;d=identicon"
>
</a>
<a
class="commit-row-message"
href="/gitlab-org/gitlab-ce/commit/{{pipeline.sha}}"
>
fix broken repo 500 errors in UI and added relevant specs
</a>
</p> </p>
</td> </td>
<td class="stage-cell"> <td class="stage-cell">
......
...@@ -12,11 +12,28 @@ ...@@ -12,11 +12,28 @@
console.error('API Error for Pipelines'); console.error('API Error for Pipelines');
}); });
goFetch(Vue);
setInterval(() => { setInterval(() => {
console.log('DID IT'); console.log('DID IT');
goFetch(Vue); goFetch(Vue);
}, 3000); }, 30000);
}
fetchCommits(vue) {
const goFetch = vueSet =>
this.$http.get(`/api/v3/projects/${this.scope}/pipelines`)
.then((response) => {
vueSet.set(this, 'pipelines', JSON.parse(response.body));
}, () => {
console.error('API Error for Pipelines');
});
this.$http.get(`/api/v3/projects/${this.scope}/repository/commits`)
.then((response) => {
vue.set(this, 'commits', JSON.parse(response.body));
}, () => {
console.error('API Error for Pipelines');
})
.then(() => goFetch(vue));
} }
}; };
})(window.gl || (window.gl = {})); })(window.gl || (window.gl = {}));
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
el: ".app", el: ".app",
data:{ data:{
scope: "#{@project.id}", scope: "#{@project.id}",
commits: "#{@commit}",
store: new gl.PipelineStore(), store: new gl.PipelineStore(),
}, },
components: { components: {
......
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