diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-27 13:12:35 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-27 13:12:35 +0000 |
commit | ed81ee9ba2b5a0b68996ccb238bfa4c69a6df062 (patch) | |
tree | 831e186cd5ed4072a0883c4eac563cbcd9c70f23 /app/views/layouts/nav/sidebar/_admin.html.haml | |
parent | 636ea40e182fca92e89facbcb52445fcefef9506 (diff) | |
download | gitlab-ce-ed81ee9ba2b5a0b68996ccb238bfa4c69a6df062.tar.gz |
Revert "Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'master'"
This reverts merge request !20679
Diffstat (limited to 'app/views/layouts/nav/sidebar/_admin.html.haml')
-rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index ff25b040913..0047efa363d 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 projects users groups jobs runners gitaly_servers cohorts conversational_development_index), 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 projects users groups jobs runners gitaly_servers cohorts conversational_development_index), html_options: { class: "fly-out-top-item" } ) do = link_to admin_root_path do %strong.fly-out-top-item-name = _('Overview') @@ -47,6 +47,14 @@ = link_to admin_gitaly_servers_path, title: 'Gitaly Servers' do %span = _('Gitaly Servers') + = nav_link path: 'cohorts#index' do + = link_to admin_cohorts_path, title: _('Cohorts') do + %span + = _('Cohorts') + = nav_link(controller: :conversational_development_index) do + = link_to admin_conversational_development_index_path, title: _('ConvDev Index') do + %span + = _('ConvDev Index') = nav_link(controller: %w(system_info background_jobs logs health_check requests_profiles)) do = link_to admin_system_info_path do |