Commit 0151eb59 authored by Bryce Johnson's avatar Bryce Johnson

Correctly link ConvDev Index nav links to its controller.

parent 2f46c3a8
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= icon('wrench') = icon('wrench')
.sidebar-context-title Admin Area .sidebar-context-title Admin Area
%ul.sidebar-top-level-items %ul.sidebar-top-level-items
= nav_link(controller: %w(dashboard admin projects users groups jobs runners cohorts), html_options: {class: 'home'}) do = nav_link(controller: %w(dashboard admin projects users groups jobs runners cohorts conversational_development_index), html_options: {class: 'home'}) do
= sidebar_link admin_root_path, title: _('Overview'), css: 'shortcuts-tree' do = sidebar_link admin_root_path, title: _('Overview'), css: 'shortcuts-tree' do
.nav-icon-container .nav-icon-container
= custom_icon('overview') = custom_icon('overview')
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
Overview Overview
%ul.sidebar-sub-level-items %ul.sidebar-sub-level-items
= nav_link(controller: %w(dashboard admin projects users groups jobs runners cohorts), html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: %w(dashboard admin projects users groups jobs runners cohorts conversational_development_index), 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') }
...@@ -52,16 +52,16 @@ ...@@ -52,16 +52,16 @@
%span %span
ConvDev Index ConvDev Index
= nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles)) do = nav_link(controller: %w(system_info background_jobs logs health_check requests_profiles)) do
= sidebar_link admin_conversational_development_index_path, title: _('Monitoring') do = sidebar_link admin_system_info_path, title: _('Monitoring') do
.nav-icon-container .nav-icon-container
= custom_icon('monitoring') = custom_icon('monitoring')
%span.nav-item-name %span.nav-item-name
Monitoring Monitoring
%ul.sidebar-sub-level-items %ul.sidebar-sub-level-items
= nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles), html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: %w(system_info background_jobs logs health_check requests_profiles), html_options: { class: "fly-out-top-item" } ) do
= link_to admin_conversational_development_index_path do = link_to admin_system_info_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Monitoring') } #{ _('Monitoring') }
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
......
---
title: Fix ConvDev Index nav item and Monitoring submenu regression
merge_request: !14124
author:
type: fixed
...@@ -23,7 +23,7 @@ If you have just started using GitLab, it may take a few weeks for data to be ...@@ -23,7 +23,7 @@ If you have just started using GitLab, it may take a few weeks for data to be
collected before this feature is available. collected before this feature is available.
This feature is accessible only to a system admin, at This feature is accessible only to a system admin, at
**Admin area > Monitoring > ConvDev Index**. **Admin area > Overview > ConvDev Index**.
[ce-30469]: https://gitlab.com/gitlab-org/gitlab-ce/issues/30469 [ce-30469]: https://gitlab.com/gitlab-org/gitlab-ce/issues/30469
[ping]: ../settings/usage_statistics.md#usage-ping [ping]: ../settings/usage_statistics.md#usage-ping
doc/user/admin_area/monitoring/img/convdev_index.png

30.3 KB | W: 0px | H: 0px

doc/user/admin_area/monitoring/img/convdev_index.png

113 KB | W: 0px | H: 0px

  • 2-up
  • Swipe
  • Onion skin
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