Make a build views nicer

1 files changed, 15 insertions, 13 deletions

diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 21a30080868..ba0baa1e2a2 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -36,17 +36,19 @@
 
 .table-holder
   %table.table.builds
-    %thead
-      %tr
-        %th Status
-        %th Build ID
-        %th Stage
-        %th Name
-        %th Duration
-        %th Finished at
-        - if @project.build_coverage_enabled?
-          %th Coverage
-        %th
     - builds = ci_commit.statuses.latest.ordered
-    = render builds, coverage: @project.build_coverage_enabled?, stage: true, ref: false, allow_retry: true
-    = render ci_commit.retried, coverage: @project.build_coverage_enabled?, stage: true, ref: false, retried: true
+    - CommitStatus.where(id: builds).stages.each do |stage|
+      - stage_builds = builds.where(stage: stage)
+      %tr
+        %th{colspan: 10}
+          %strong
+            - stage_status = CommitStatus.where(id: stage_builds.ids).status
+            %span{class: "ci-status-link ci-status-icon-#{stage_status}"}
+              = ci_icon_for_status(stage_status)
+             
+            = stage.titleize.pluralize
+        = render stage_builds, coverage: @project.build_coverage_enabled?, tage: false, ref: false, allow_retry: true
+        = render ci_commit.retried.select { |build| build.stage == stage }, coverage: @project.build_coverage_enabled?, stage: false, ref: false, retried: true
+      %tr
+        %td{colspan: 10}
+