Liken admin and project builds views to each other

app/views/admin/builds/_build.html.haml

@@ -45,7 +45,10 @@
       .light none
 
   %td
-    #{build.stage} / #{build.name}
+    #{build.stage}
+
+  %td
+    #{build.name}
 
   %td
     - if build.duration
@@ -58,8 +61,8 @@
         = icon("calendar")
         %span #{time_ago_with_tooltip(build.finished_at)}
 
-  - if defined?(coverage) && coverage
   %td.coverage
+    - if defined?(coverage) && coverage
       - if build.try(:coverage)
         #{build.coverage}%
 

app/views/projects/builds/_content_list.html.haml

-- if project.nil?
-  - if builds.blank?
+- if builds.blank?
   %li
     .nothing-here-block No builds to show
-  - else
+- else
   .table-holder
     %table.table.builds
       %thead
         %tr
           %th Status
           %th Commit
+          - if project.nil?
             %th Project
             %th Runner
+          %th Stage
           %th Name
           %th
           %th
+          - if project.present?
+            - if @project.build_coverage_enabled?
+              %th Coverage
 
+
+      - if project.nil?
         - builds.each do |build|
           = render "admin/builds/build", build: build
-
-    = paginate builds, theme: 'gitlab'
-
-- if project.present?
-  - if builds.blank?
-    %li
-      .nothing-here-block No builds to show
       - else
-    .table-holder
-      %table.table.builds
-        %thead
-          %tr
-            %th Status
-            %th Commit
-            %th Stage
-            %th Name
-            %th
-            - if project.build_coverage_enabled?
-              %th Coverage
-            %th
-
         = render builds, commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: project.build_coverage_enabled?
 
   = paginate builds, theme: 'gitlab'

app/views/projects/ci/builds/_build.html.haml

@@ -52,12 +52,11 @@
       - else
         .light none
 
-  - if defined?(stage) && stage
   %td
-      = build.stage
+    #{build.stage}
 
   %td
-    = build.name
+    #{build.name}
 
   %td
     - if build.duration