diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-09-21 20:32:19 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-09-21 20:32:19 +0000 |
commit | e255b88e51b956d92afb5e9b90a2749a60e63459 (patch) | |
tree | 32ed92f81e985f5b0dbf2a47285eb257c82d31c8 | |
parent | 12e97d397cde568631eff20984714a20e8e78ebd (diff) | |
parent | 27627697a0089dd9ae2e5a1fd2e2e228dd9b9d53 (diff) | |
download | gitlab-ce-e255b88e51b956d92afb5e9b90a2749a60e63459.tar.gz |
Merge branch 'ee-admin-geo-namespace-support' into 'master'
Backport Admin menu changes from EE
See merge request gitlab-org/gitlab-ce!21864
-rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index a2636f8179a..f912a32ee1a 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -7,14 +7,14 @@ .sidebar-context-title = _('Admin Area') %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 .nav-icon-container = sprite_icon('overview') %span.nav-item-name = _('Overview') %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 %strong.fly-out-top-item-name = _('Overview') @@ -23,7 +23,7 @@ = link_to admin_root_path, title: _('Overview') do %span = _('Dashboard') - = nav_link(controller: [:admin, :projects]) do + = nav_link(controller: [:admin, 'admin/projects']) do = link_to admin_projects_path, title: _('Projects') do %span = _('Projects') |