Commit e255b88e authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'ee-admin-geo-namespace-support' into 'master'

Backport Admin menu changes from EE

See merge request gitlab-org/gitlab-ce!21864
parents 12e97d39 27627697
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
.sidebar-context-title .sidebar-context-title
= _('Admin Area') = _('Admin Area')
%ul.sidebar-top-level-items %ul.sidebar-top-level-items
= nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers), html_options: {class: 'home'}) do = nav_link(controller: %w(dashboard admin admin/projects users groups jobs runners gitaly_servers), html_options: {class: 'home'}) do
= link_to admin_root_path, class: 'shortcuts-tree' do = link_to admin_root_path, class: 'shortcuts-tree' do
.nav-icon-container .nav-icon-container
= sprite_icon('overview') = sprite_icon('overview')
%span.nav-item-name %span.nav-item-name
= _('Overview') = _('Overview')
%ul.sidebar-sub-level-items %ul.sidebar-sub-level-items
= nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers), html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: %w(dashboard admin admin/projects users groups jobs runners gitaly_servers), html_options: { class: "fly-out-top-item" } ) do
= link_to admin_root_path do = link_to admin_root_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
= _('Overview') = _('Overview')
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
= link_to admin_root_path, title: _('Overview') do = link_to admin_root_path, title: _('Overview') do
%span %span
= _('Dashboard') = _('Dashboard')
= nav_link(controller: [:admin, :projects]) do = nav_link(controller: [:admin, 'admin/projects']) do
= link_to admin_projects_path, title: _('Projects') do = link_to admin_projects_path, title: _('Projects') do
%span %span
= _('Projects') = _('Projects')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment