Commit 446eecb8 authored by Annabel Dunstone's avatar Annabel Dunstone

Move pipeline ID to commit column; add status; branch style updates

parent 47199c35
...@@ -83,7 +83,37 @@ ...@@ -83,7 +83,37 @@
} }
} }
table.builds {
.table.builds {
tr {
th {
padding: 18px 10px;
border: none;
}
}
tbody {
border-top-width: 1px;
}
.branch-commit {
.branch-name {
max-width: 180px;
overflow: hidden;
display: inline-block;
white-space: nowrap;
vertical-align: top;
text-overflow: ellipsis;
margin-left: 10px;
}
.commit-id {
color: $gl-link-color;
}
}
.build-link { .build-link {
a { a {
color: $gl-dark-link-color; color: $gl-dark-link-color;
......
- status = pipeline.status - status = pipeline.status
%tr.commit %tr.commit
%td.commit-link %td.commit-link
= link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: "ci-status ci-#{status}" do = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline.id) do
= ci_icon_for_status(status) = ci_status_with_icon(status)
%strong ##{pipeline.id}
%td %td
%div.branch-commit %div.branch-commit
%span ##{pipeline.id}
- if pipeline.ref - if pipeline.ref
= link_to pipeline.ref, namespace_project_commits_path(@project.namespace, @project, pipeline.ref), class: "monospace" = link_to pipeline.ref, namespace_project_commits_path(@project.namespace, @project, pipeline.ref), class: "monospace branch-name"
· ·
= link_to pipeline.short_sha, namespace_project_commit_path(@project.namespace, @project, pipeline.sha), class: "commit-id monospace" = link_to pipeline.short_sha, namespace_project_commit_path(@project.namespace, @project, pipeline.sha), class: "commit-id monospace"
   
......
...@@ -45,13 +45,13 @@ ...@@ -45,13 +45,13 @@
.table-holder .table-holder
%table.table.builds %table.table.builds
%tbody %tbody
%th ID %th Status
%th Commit %th Commit
- stages.each do |stage| - stages.each do |stage|
%th.stage %th.stage
%span.has-tooltip{ title: "#{stage.titleize}" } %span.has-tooltip{ title: "#{stage.titleize}" }
= stage.titleize = stage.titleize
%th Duration %%th
%th %th
= render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
......
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