Skip to content
Snippets Groups Projects
Commit 2acad0b7 authored by Valery Sizov's avatar Valery Sizov
Browse files

Merge branch 'ui_fix' into 'master'

Remove redundant header

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

See merge request !94
parents 3c4d6044 cd44af8b
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
= 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
Loading
Loading
= content_for :title do
%h3.project-title
Events
.pull-right
%small
= pluralize(@events.total_count, 'event')
%table.table
%thead
%tr
Loading
Loading
= content_for :title do
%h3.project-title
Manage Projects
.pull-right
%small
= pluralize(@projects.total_count, 'project')
%table.table
%thead
%tr
Loading
Loading
= 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}
Loading
Loading
Loading
Loading
@@ -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)
Loading
Loading
@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment