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
46cfd642
Commit
46cfd642
authored
Jul 25, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update MR pipeline view
parent
d71d3b8c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
54 deletions
+17
-54
app/views/projects/commit/_pipelines_list.haml
app/views/projects/commit/_pipelines_list.haml
+16
-53
app/views/projects/merge_requests/show/_pipelines.html.haml
app/views/projects/merge_requests/show/_pipelines.html.haml
+1
-1
No files found.
app/views/projects/commit/_pipelines_list.haml
View file @
46cfd642
-
status
=
pipeline
.
status
%ul
.content-list.pipelines
%ul
.content-list.pipelines
-
if
pipelines
.
blank?
.table-holder
%li
%table
.table.builds
.nothing-here-block
No pipelines to show
%tbody
-
else
%th
Status
.table-holder
%th
Commit
%table
.table.builds
%th
.stage
%tbody
%th
%th
Status
%th
%th
Commit
%tr
.commit
-
pipelines
.
stages
.
each
do
|
stage
|
%td
.commit-link
%th
.stage
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
%span
.has-tooltip
{
title:
"#{stage.titleize}"
}
=
ci_status_with_icon
(
status
)
=
stage
.
titleize
%td
%th
.branch-commit
%th
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
=
render
pipelines
,
commit_sha:
true
,
stage:
true
,
allow_retry:
true
,
stages:
stages
%span
##{pipeline.id}
-
if
pipeline
.
ref
.icon-container
=
pipeline
.
tag?
?
icon
(
'tag'
)
:
icon
(
'code-fork'
)
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
pipeline
.
ref
),
class:
"monospace branch-name"
.icon-container
=
custom_icon
(
"icon_commit"
)
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
pipeline
.
sha
),
class:
"commit-id monospace"
-
if
pipeline
.
latest?
%span
.label.label-success.has-tooltip
{
title:
'Latest build for this branch'
}
latest
-
if
pipeline
.
triggered?
%span
.label.label-primary
triggered
-
if
pipeline
.
yaml_errors
.
present?
%span
.label.label-danger.has-tooltip
{
title:
"#{pipeline.yaml_errors}"
}
yaml invalid
-
if
pipeline
.
builds
.
any?
(
&
:stuck?
)
%span
.label.label-warning
stuck
%p
.commit-title
-
if
commit
=
pipeline
.
commit
=
author_avatar
(
commit
,
size:
20
)
=
link_to_gfm
truncate
(
commit
.
title
,
length:
60
),
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
commit
.
id
),
class:
"commit-row-message"
-
else
Cant find HEAD commit for this branch
-# - stages_status = pipeline.statuses.latest.stages_status
-# - stages.each do |stage|
-# %td.stage-cell
-# - status = stages_status[stage]
-# - tooltip = "#{stage.titleize}: #{status || 'not found'}"
-# - if status
-# = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do
-# = ci_icon_for_status(status)
-# - else
-# .light.has-tooltip{ title: tooltip }
-# \-
app/views/projects/merge_requests/show/_pipelines.html.haml
View file @
46cfd642
=
render
"projects/commit/pipelines_list"
,
pipeline
:
@pipeline
,
link_to_commit:
true
=
render
"projects/commit/pipelines_list"
,
pipeline
s:
@pipelines
,
link_to_commit:
true
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