Merge branch 'ui_fix' into 'master'

Remove redundant header

https://dev.gitlab.org/gitlab/gitlab-ci/issues/193

See merge request !94

7 files changed, 6 insertions, 31 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 25623d2..0588659 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v7.11.0
   - Clean up project advanced settings.
   - Add a GitLab project path parameter to the project API
   - Remove projects IDs from dashboard
+  - UI fix: Remove page headers from the admin area
 
 v7.10.1
   - Fix failing migration when update to 7.10 from 7.8 and older versions
diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml
index 3db680e..6933a8e 100644
--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
@@ -1,11 +1,3 @@
-= content_for :title do
-  %h3.project-title
-    All builds
-    
-    .pull-right
-      %small
-        = pluralize(@builds.total_count, 'build')
-
 %ul.nav.nav-tabs.append-bottom-20
   %li{class: ("active" if @scope.nil?)}
     = link_to 'All builds', admin_builds_path
diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml
index b86eb5d..f9ab099 100644
--- a/app/views/admin/events/index.html.haml
+++ b/app/views/admin/events/index.html.haml
@@ -1,10 +1,3 @@
-= content_for :title do
-  %h3.project-title
-    Events
-    .pull-right
-      %small
-        = pluralize(@events.total_count, 'event')
-
 %table.table
   %thead
     %tr
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 3816d3d..7395657 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,10 +1,3 @@
-= content_for :title do
-  %h3.project-title
-    Manage Projects
-    .pull-right
-      %small
-        = pluralize(@projects.total_count, 'project')
-
 %table.table
   %thead
     %tr
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index 869561f..0d64c8b 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -1,11 +1,3 @@
-= content_for :title do
-  %h3.project-title
-    Manage Runners
-
-    .pull-right
-      %small
-        = pluralize(@runners.total_count, 'runner')
-
 %p.lead
   %span To register new runner you should enter the following registration token. With this token the runner will request a unique runner token and use that for future communication.
   %code #{GitlabCi::REGISTRATION_TOKEN}
diff --git a/app/views/layouts/_nav_admin.html.haml b/app/views/layouts/_nav_admin.html.haml
index c5155db..12bfb80 100644
--- a/app/views/layouts/_nav_admin.html.haml
+++ b/app/views/layouts/_nav_admin.html.haml
@@ -11,8 +11,12 @@
     = link_to admin_runners_path do
       %i.icon-cog
       Runners
+      %small.pull-right
+        = Runner.count(:all)
   = nav_link path: 'builds' do
     = link_to admin_builds_path do
       %i.icon-link
       Builds
+      %small.pull-right
+        = Build.count(:all)
  
diff --git a/spec/features/admin/projects_spec.rb b/spec/features/admin/projects_spec.rb
index a6adae2..6f87e36 100644
--- a/spec/features/admin/projects_spec.rb
+++ b/spec/features/admin/projects_spec.rb
@@ -14,6 +14,6 @@ describe "Admin Projects" do
       visit admin_projects_path
     end
 
-    it { page.should have_content "Manage Projects" }
+    it { page.should have_content "Projects" }
   end
 end