Commit e491056e authored by Jacob Schatz's avatar Jacob Schatz

Merge branch '17736-builds-hotfix' into 'master'

Fix builds page

Fixes #17736    
Fixes #17703 

- Move tags into column
- Put column headers back

<img src="/uploads/57609fd2d65c3b80f57b32cbbe316653/Screen_Shot_2016-05-23_at_10.20.37_AM.png" width="800px">    



See merge request !4249
parents 74ce3faa e8f869f9
...@@ -42,18 +42,18 @@ ...@@ -42,18 +42,18 @@
%td %td
= build.name = build.name
.pull-right %td
.label-container .label-container
- if build.tags.any? - if build.tags.any?
- build.tags.each do |tag| - build.tags.each do |tag|
%span.label.label-primary %span.label.label-primary
= tag = tag
- if build.try(:trigger_request) - if build.try(:trigger_request)
%span.label.label-info triggered %span.label.label-info triggered
- if build.try(:allow_failure) - if build.try(:allow_failure)
%span.label.label-danger allowed to fail %span.label.label-danger allowed to fail
- if defined?(retried) && retried - if defined?(retried) && retried
%span.label.label-warning retried %span.label.label-warning retried
%td.duration %td.duration
- if build.duration - if build.duration
......
...@@ -37,5 +37,16 @@ ...@@ -37,5 +37,16 @@
.table-holder .table-holder
%table.table.builds %table.table.builds
%thead
%tr
%th Status
%th Build ID
%th Name
%th Tags
%th Duration
%th Finished at
- if @project.build_coverage_enabled?
%th Coverage
%th
- ci_commit.statuses.stages.each do |stage| - ci_commit.statuses.stages.each do |stage|
= render 'projects/commit/ci_stage', stage: stage, statuses: ci_commit.statuses.where(stage: stage) = render 'projects/commit/ci_stage', stage: stage, statuses: ci_commit.statuses.where(stage: stage)
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