Merge branch 'convdev-index-ee-compat' into 'master'

Move ConvDev index to Overview from Monitoring (EE Compatible Version)

See merge request !2732

app/views/admin/dashboard/_head.html.haml

@@ -31,3 +31,7 @@
           = 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

app/views/admin/monitoring/_head.html.haml

@@ -3,10 +3,6 @@
     = render 'shared/nav_scroll'
     .nav-links.sub-nav.scrolling-tabs
       %ul{ class: (container_class) }
-        = nav_link(controller: :conversational_development_index) do
-          = link_to admin_conversational_development_index_path, title: 'ConvDev Index' do
-            %span
-              ConvDev Index
         = nav_link(controller: :system_info) do
           = link_to admin_system_info_path, title: 'System Info' do
             %span

app/views/layouts/nav/_new_admin_sidebar.html.haml

@@ -42,6 +42,10 @@
             = 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(conversational_development_index system_info background_jobs logs health_check requests_profiles audit_logs)) do
         = link_to admin_conversational_development_index_path, title: 'Monitoring' do
@@ -51,10 +55,6 @@
             Monitoring
 
         %ul.sidebar-sub-level-items
-          = nav_link(controller: :conversational_development_index) do
-            = link_to admin_conversational_development_index_path, title: 'ConvDev Index' do
-              %span
-                ConvDev Index
           = nav_link(controller: :system_info) do
             = link_to admin_system_info_path, title: 'System Info' do
               %span

changelogs/unreleased/34413-move-convdev-index-location-to-after-cohorts.yml

+---
+title: Move ConvDev Index location to after Cohorts.
+merge_request: !13398
+author: