Commit 87ee8763 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Add separate pipeline and commit columns

parent 359b4f9a
......@@ -23,10 +23,9 @@
.table.builds {
min-width: 1200px;
.branch-commit {
width: 33%;
.pipeline-id {
color: $black;
}
}
}
......@@ -81,7 +80,13 @@
}
}
.avatar {
margin-left: 0;
float: none;
}
.branch-commit {
width: 30%;
.branch-name {
font-weight: bold;
......@@ -118,10 +123,6 @@
text-overflow: ellipsis;
}
.avatar {
margin-left: 0;
}
.label {
margin-right: 4px;
}
......@@ -137,18 +138,7 @@
.icon-container {
display: inline-block;
text-align: right;
width: 15px;
.fa {
position: relative;
right: 3px;
}
svg {
position: relative;
right: 1px;
}
width: 10px;
}
.stage-cell {
......
......@@ -9,17 +9,13 @@
= ci_icon_for_status(status)
- else
= ci_status_with_icon(status)
%td.branch-commit
%td
= link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
%span ##{pipeline.id}
- if pipeline.ref && show_branch
.icon-container
= pipeline.tag? ? icon('tag') : icon('code-fork')
= link_to pipeline.ref, namespace_project_commits_path(pipeline.project.namespace, pipeline.project, pipeline.ref), class: "monospace branch-name"
- if show_commit
.icon-container
= custom_icon("icon_commit")
= link_to pipeline.short_sha, namespace_project_commit_path(pipeline.project.namespace, pipeline.project, pipeline.sha), class: "commit-id monospace"
%span.pipeline-id ##{pipeline.id}
%span by
- if commit = pipeline.commit
= author_avatar(commit, size: 20)
- if pipeline.latest?
%span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest
- if pipeline.triggered?
......@@ -29,6 +25,16 @@
- if pipeline.builds.any?(&:stuck?)
%span.label.label-warning stuck
%td.branch-commit
- if pipeline.ref && show_branch
.icon-container
= pipeline.tag? ? icon('tag') : icon('code-fork')
= link_to pipeline.ref, namespace_project_commits_path(pipeline.project.namespace, pipeline.project, pipeline.ref), class: "monospace branch-name"
- if show_commit
.icon-container
= custom_icon("icon_commit")
= link_to pipeline.short_sha, namespace_project_commit_path(pipeline.project.namespace, pipeline.project, pipeline.sha), class: "commit-id monospace"
%p.commit-title
- if commit = pipeline.commit
= author_avatar(commit, size: 20)
......@@ -36,7 +42,6 @@
- else
Cant find HEAD commit for this branch
- stages_status = pipeline.statuses.relevant.latest.stages_status
%td.stage-cell
- stages.each do |stage|
......
......@@ -8,6 +8,7 @@
%tbody
%th Status
%th Pipeline
%th Commit
%th Stages
%th
%th
......
......@@ -45,11 +45,12 @@
.table-holder
%table.table.builds
%thead
%th.col-xs-1.col-sm-1 Status
%th.col-xs-2.col-sm-4 Pipeline
%th.col-xs-2.col-sm-2 Stages
%th.col-xs-2.col-sm-2
%th.hidden-xs.col-sm-3
%th Status
%th Pipeline
%th Commit
%th Stages
%th
%th.hidden-xs
= render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
= paginate @pipelines, theme: 'gitlab'
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