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
Jérome Perrin
gitlab-ce
Commits
c55ba052
Commit
c55ba052
authored
Dec 01, 2016
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add svg to pipeline index haml - prep for commit comp change - [ci skip]
parent
1e7f91f2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+11
-2
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+2
-0
No files found.
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View file @
c55ba052
...
@@ -74,6 +74,15 @@
...
@@ -74,6 +74,15 @@
return nonUser;
return nonUser;
},
},
ref(pipeline) {
const { ref } = pipeline;
const commitRef = {
name: ref.name,
tag: ref['tag?'],
ref_url: ref.url,
};
return commitRef;
},
addTimeInterval(id, that) {
addTimeInterval(id, that) {
this.allTimeIntervals.push({ id, component: that });
this.allTimeIntervals.push({ id, component: that });
},
},
...
@@ -92,10 +101,10 @@
...
@@ -92,10 +101,10 @@
<pipeline-url :pipeline='pipeline'></pipeline-url>
<pipeline-url :pipeline='pipeline'></pipeline-url>
<td>
<td>
<commit
<commit
:
tag="pipeline.ref['tag?']"
:
ref='ref(pipeline)'
:author='author(pipeline)'
:author='author(pipeline)'
:tag="pipeline.ref['tag?']"
:title='pipeline.commit.title'
:title='pipeline.commit.title'
:ref='pipeline.ref'
:short_sha='pipeline.commit.short_id'
:short_sha='pipeline.commit.short_id'
:commit_url='pipeline.commit.commit_url'
:commit_url='pipeline.commit.commit_url'
>
>
...
...
app/views/projects/pipelines/index.html.haml
View file @
c55ba052
...
@@ -53,6 +53,8 @@
...
@@ -53,6 +53,8 @@
=
render
@pipelines
,
commit_sha:
true
,
stage:
true
,
allow_retry:
true
=
render
@pipelines
,
commit_sha:
true
,
stage:
true
,
allow_retry:
true
=
paginate
@pipelines
,
theme:
'gitlab'
=
paginate
@pipelines
,
theme:
'gitlab'
-
else
-
else
.commit-icon-svg.hidden
=
custom_icon
(
"icon_commit"
)
.vue-pipelines-index
.vue-pipelines-index
=
page_specific_javascript_tag
(
'vue_icons/index.js'
)
=
page_specific_javascript_tag
(
'vue_icons/index.js'
)
...
...
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