Move builds tab to admin overview

3 files changed, 59 insertions, 54 deletions

diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml
index d74cf8598e8..efd5b12cfeb 100644
--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
@@ -1,49 +1,54 @@
-.top-area
-  %ul.nav-links
-    %li{class: ('active' if @scope.nil?)}
-      = link_to admin_builds_path do
-        All
-        %span.badge.js-totalbuilds-count= @all_builds.count(:id)
-
-    %li{class: ('active' if @scope == 'running')}
-      = link_to admin_builds_path(scope: :running) do
-        Running
-        %span.badge.js-running-count= number_with_delimiter(@all_builds.running_or_pending.count(:id))
-
-    %li{class: ('active' if @scope == 'finished')}
-      = link_to admin_builds_path(scope: :finished) do
-        Finished
-        %span.badge.js-running-count= number_with_delimiter(@all_builds.finished.count(:id))
-
-  .nav-controls
-    - if @all_builds.running_or_pending.any?
-      = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
-
-.row-content-block.second-block
-  #{(@scope || 'all').capitalize} builds
-
-%ul.content-list
-  - if @builds.blank?
-    %li
-      .nothing-here-block No builds to show
-  - else
-    .table-holder
-      %table.table.builds
-        %thead
-          %tr
-            %th Status
-            %th Build ID
-            %th Project
-            %th Commit
-            %th Ref
-            %th Runner
-            %th Name
-            %th Tags
-            %th Duration
-            %th Finished at
-            %th
-
-        - @builds.each do |build|
-          = render "admin/builds/build", build: build
-
-    = paginate @builds, theme: 'gitlab'
+- @no_container = true
+= render "admin/dashboard/head"
+
+%div{ class: (container_class) }
+
+  .top-area
+    %ul.nav-links
+      %li{class: ('active' if @scope.nil?)}
+        = link_to admin_builds_path do
+          All
+          %span.badge.js-totalbuilds-count= @all_builds.count(:id)
+
+      %li{class: ('active' if @scope == 'running')}
+        = link_to admin_builds_path(scope: :running) do
+          Running
+          %span.badge.js-running-count= number_with_delimiter(@all_builds.running_or_pending.count(:id))
+
+      %li{class: ('active' if @scope == 'finished')}
+        = link_to admin_builds_path(scope: :finished) do
+          Finished
+          %span.badge.js-running-count= number_with_delimiter(@all_builds.finished.count(:id))
+
+    .nav-controls
+      - if @all_builds.running_or_pending.any?
+        = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
+
+  .row-content-block.second-block
+    #{(@scope || 'all').capitalize} builds
+
+  %ul.content-list
+    - if @builds.blank?
+      %li
+        .nothing-here-block No builds to show
+    - else
+      .table-holder
+        %table.table.builds
+          %thead
+            %tr
+              %th Status
+              %th Build ID
+              %th Project
+              %th Commit
+              %th Ref
+              %th Runner
+              %th Name
+              %th Tags
+              %th Duration
+              %th Finished at
+              %th
+
+          - @builds.each do |build|
+            = render "admin/builds/build", build: build
+
+      = paginate @builds, theme: 'gitlab'
diff --git a/app/views/admin/dashboard/_head.html.haml b/app/views/admin/dashboard/_head.html.haml
index b1adc316b50..ef9d246b2a2 100644
--- a/app/views/admin/dashboard/_head.html.haml
+++ b/app/views/admin/dashboard/_head.html.haml
@@ -4,6 +4,10 @@
       = link_to admin_root_path, title: 'Overview' do
         %span
           Overview
+    = nav_link path: 'builds#index' do
+      = link_to admin_builds_path, title: 'Builds' do
+        %span
+          Builds
     = nav_link(controller: [:admin, :projects]) do
       = link_to admin_namespaces_projects_path, title: 'Projects' do
         %span
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index ad25d4908ff..a72f1017132 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -1,6 +1,6 @@
 %ul.nav-links.scrolling-tabs
   .fade-left
-  = nav_link(controller: %w(dashboard admin projects users groups), html_options: {class: 'home'}) do
+  = nav_link(controller: %w(dashboard admin projects users groups builds), html_options: {class: 'home'}) do
     = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
       %span
         Overview
@@ -12,10 +12,6 @@
     = link_to admin_runners_path, title: 'Runners' do
       %span
         Runners
-  = nav_link path: 'builds#index' do
-    = link_to admin_builds_path, title: 'Builds' do
-      %span
-        Builds
   = nav_link(controller: %w(background_jobs logs health_check)) do
     = link_to admin_background_jobs_path, title: 'Monitoring' do
       %span