Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
905f7391
Commit
905f7391
authored
Nov 05, 2016
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
status icon and status components dynamic by scope
parent
35066c85
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
38 deletions
+38
-38
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+5
-5
app/assets/javascripts/vue_pipelines_status/failed.js.es6
app/assets/javascripts/vue_pipelines_status/failed.js.es6
+4
-4
app/assets/javascripts/vue_pipelines_status/pending.js.es6
app/assets/javascripts/vue_pipelines_status/pending.js.es6
+4
-4
app/assets/javascripts/vue_pipelines_status/running.js.es6
app/assets/javascripts/vue_pipelines_status/running.js.es6
+4
-4
app/assets/javascripts/vue_pipelines_status/status.js.es6
app/assets/javascripts/vue_pipelines_status/status.js.es6
+21
-21
No files found.
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View file @
905f7391
...
...
@@ -11,7 +11,7 @@
'vue-pipeline-url': gl.VuePipelineUrl,
'vue-pipeline-head': gl.VuePipelineHead,
'vue-gl-pagination': gl.VueGlPagination,
'vue-status-
pipeline': gl.VueStatusPipelin
e,
'vue-status-
scope': gl.VueStatusScop
e,
},
data() {
return {
...
...
@@ -54,11 +54,11 @@
<vue-pipeline-head></vue-pipeline-head>
<tbody>
<tr class="commit" v-for='pipeline in pipelines'>
<vue-status-
pipelin
e
:
pipelin
e='pipeline'
:
pipelin
eurl='pipelineurl'
<vue-status-
scop
e
:
scop
e='pipeline'
:
scop
eurl='pipelineurl'
>
</vue-status-
pipelin
e>
</vue-status-
scop
e>
<vue-pipeline-url
:pipeline='pipeline'
:pipelineurl='pipelineurl'
...
...
app/assets/javascripts/vue_pipelines_status/failed.js.es6
View file @
905f7391
...
...
@@ -2,17 +2,17 @@
/* eslint-disable no-param-reassign */
((gl) => {
gl.VueFailed
Pipelin
e = Vue.extend({
gl.VueFailed
Scop
e = Vue.extend({
components: {
'vue-failed-icon': gl.VuePendingIcon,
},
props: [
'
pipelin
e',
'
pipelin
eurl',
'
scop
e',
'
scop
eurl',
],
template: `
<td class="commit-link">
<a :href='
pipelineurl(pipelin
e.id)'>
<a :href='
scopeurl(scop
e.id)'>
<span class="ci-status ci-failed">
<vue-failed-icon></vue-failed-icon>
failed
...
...
app/assets/javascripts/vue_pipelines_status/pending.js.es6
View file @
905f7391
...
...
@@ -2,17 +2,17 @@
/* eslint-disable no-param-reassign */
((gl) => {
gl.VuePending
Pipelin
e = Vue.extend({
gl.VuePending
Scop
e = Vue.extend({
components: {
'vue-pending-icon': gl.VuePendingIcon,
},
props: [
'
pipelin
e',
'
pipelin
eurl',
'
scop
e',
'
scop
eurl',
],
template: `
<td class="commit-link">
<a :href='
pipelineurl(pipelin
e.id)'>
<a :href='
scopeurl(scop
e.id)'>
<span class="ci-status ci-pending">
<vue-pending-icon></vue-pending-icon>
pending
...
...
app/assets/javascripts/vue_pipelines_status/running.js.es6
View file @
905f7391
...
...
@@ -2,17 +2,17 @@
/* eslint-disable no-param-reassign */
((gl) => {
gl.VueRunning
Pipelin
e = Vue.extend({
gl.VueRunning
Scop
e = Vue.extend({
components: {
'vue-running-icon': gl.VueRunningIcon,
},
props: [
'
pipelin
e',
'
pipelin
eurl',
'
scop
e',
'
scop
eurl',
],
template: `
<td class="commit-link">
<a :href='
pipelineurl(pipelin
e.id)'>
<a :href='
scopeurl(scop
e.id)'>
<span class="ci-status ci-running">
<vue-running-icon></vue-running-icon>
running
...
...
app/assets/javascripts/vue_pipelines_status/status.js.es6
View file @
905f7391
...
...
@@ -2,36 +2,36 @@
/* eslint-disable no-param-reassign */
((gl) => {
gl.VueStatus
Pipelin
e = Vue.extend({
gl.VueStatus
Scop
e = Vue.extend({
components: {
'vue-running-
pipeline': gl.VueRunningPipelin
e,
'vue-pending-
pipeline': gl.VuePendingPipelin
e,
'vue-failed-
pipeline': gl.VueFailedPipelin
e,
'vue-running-
scope': gl.VueRunningScop
e,
'vue-pending-
scope': gl.VuePendingScop
e,
'vue-failed-
scope': gl.VueFailedScop
e,
},
props: [
'
pipelin
e',
'
pipelin
eurl',
'
scop
e',
'
scop
eurl',
],
template: `
<td class="commit-link">
<vue-running-
pipelin
e
v-if="
pipelin
e.status === 'running'"
:
pipeline='pipelin
e'
:
pipelineurl='pipelin
eurl'
<vue-running-
scop
e
v-if="
scop
e.status === 'running'"
:
scope='scop
e'
:
scopeurl='scop
eurl'
>
</vue-running-
pipelin
e>
<vue-pending-
pipelin
e
v-if="
pipelin
e.status === 'pending'"
:
pipeline='pipelin
e'
:
pipelineurl='pipelin
eurl'
</vue-running-
scop
e>
<vue-pending-
scop
e
v-if="
scop
e.status === 'pending'"
:
scope='scop
e'
:
scopeurl='scop
eurl'
>
</vue-pending-
pipelin
e>
<vue-failed-
pipelin
e
v-if="
pipelin
e.status === 'failed'"
:
pipeline='pipelin
e'
:
pipelineurl='pipelin
eurl'
</vue-pending-
scop
e>
<vue-failed-
scop
e
v-if="
scop
e.status === 'failed'"
:
scope='scop
e'
:
scopeurl='scop
eurl'
>
</vue-failed-
pipelin
e>
</vue-failed-
scop
e>
</td>
`,
});
...
...
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