BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
04a4520c
Commit
04a4520c
authored
Nov 12, 2016
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix cancel url - clearInterval on refresh and page close - fix branch url
parent
35c8e533
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
branch_commit.js.es6
...sets/javascripts/vue_pipelines_index/branch_commit.js.es6
+1
-1
pipeline_actions.js.es6
...s/javascripts/vue_pipelines_index/pipeline_actions.js.es6
+2
-2
pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+2
-2
store.js.es6
app/assets/javascripts/vue_pipelines_index/store.js.es6
+5
-1
No files found.
app/assets/javascripts/vue_pipelines_index/branch_commit.js.es6
View file @
04a4520c
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<!-- ** will need branch_url for this branch ** -->
<!-- ** will need branch_url for this branch ** -->
<a
<a
class="monospace branch-name"
class="monospace branch-name"
:href='pipeline.
commit.commit_
url'
:href='pipeline.
ref.
url'
>
>
{{pipeline.ref.name}}
{{pipeline.ref.name}}
</a>
</a>
...
...
app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
View file @
04a4520c
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
<div class="cancel-retry-btns inline">
<div class="cancel-retry-btns inline">
<!-- @click='retry($event)' -->
<!-- @click='retry($event)' -->
<a
<a
v-if='!pipeline.cancel_url'
v-if='!pipeline.cancel_url
|| pipeline.details.status !== "cancelled"
'
class="btn has-tooltip"
class="btn has-tooltip"
title="Retry"
title="Retry"
rel="nofollow"
rel="nofollow"
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
title=""
title=""
rel="nofollow"
rel="nofollow"
data-method="post"
data-method="post"
href="/gitlab-org/gitlab-ce/pipelines/4950216/cancel"
:href='pipeline.cancel_url'
data-original-title="Cancel"
data-original-title="Cancel"
>
>
<i class="fa fa-remove"></i>
<i class="fa fa-remove"></i>
...
...
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View file @
04a4520c
...
@@ -37,8 +37,8 @@
...
@@ -37,8 +37,8 @@
this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope);
this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope);
},
},
methods: {
methods: {
changepage(e
vent
, last) {
changepage(e, last) {
const text = e
vent
.target.innerText;
const text = e.target.innerText;
if (text === '...') return;
if (text === '...') return;
if (/^-?[\d.]+(?:e-?\d+)?$/.test(text)) this.pagenum = +text;
if (/^-?[\d.]+(?:e-?\d+)?$/.test(text)) this.pagenum = +text;
if (text === 'Last >>') this.pagenum = last;
if (text === 'Last >>') this.pagenum = last;
...
...
app/assets/javascripts/vue_pipelines_index/store.js.es6
View file @
04a4520c
...
@@ -53,8 +53,12 @@
...
@@ -53,8 +53,12 @@
goFetch();
goFetch();
this.intervalId = setInterval(() => {
this.intervalId = setInterval(() => {
goUpdate();
if (this.updatedAt)
goUpdate();
}, 3000);
}, 3000);
window.onbeforeunload = function removePipelineInterval() {
clearInterval(this.intervalId);
};
}
}
};
};
})(window.gl || (window.gl = {}));
})(window.gl || (window.gl = {}));
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment