BigW Consortium Gitlab

Commit 04a4520c by Regis

fix cancel url - clearInterval on refresh and page close - fix branch url

parent 35c8e533
......@@ -20,7 +20,7 @@
<!-- ** will need branch_url for this branch ** -->
<a
class="monospace branch-name"
:href='pipeline.commit.commit_url'
:href='pipeline.ref.url'
>
{{pipeline.ref.name}}
</a>
......
......@@ -80,7 +80,7 @@
<div class="cancel-retry-btns inline">
<!-- @click='retry($event)' -->
<a
v-if='!pipeline.cancel_url'
v-if='!pipeline.cancel_url || pipeline.details.status !== "cancelled"'
class="btn has-tooltip"
title="Retry"
rel="nofollow"
......@@ -95,7 +95,7 @@
title=""
rel="nofollow"
data-method="post"
href="/gitlab-org/gitlab-ce/pipelines/4950216/cancel"
:href='pipeline.cancel_url'
data-original-title="Cancel"
>
<i class="fa fa-remove"></i>
......
......@@ -37,8 +37,8 @@
this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope);
},
methods: {
changepage(event, last) {
const text = event.target.innerText;
changepage(e, last) {
const text = e.target.innerText;
if (text === '...') return;
if (/^-?[\d.]+(?:e-?\d+)?$/.test(text)) this.pagenum = +text;
if (text === 'Last >>') this.pagenum = last;
......
......@@ -53,8 +53,12 @@
goFetch();
this.intervalId = setInterval(() => {
goUpdate();
if (this.updatedAt) goUpdate();
}, 3000);
window.onbeforeunload = function removePipelineInterval() {
clearInterval(this.intervalId);
};
}
};
})(window.gl || (window.gl = {}));
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