Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/sidebars/groups/menus/ci_cd_menu.rb b/lib/sidebars/groups/menus/ci_cd_menu.rb
index a1f98b918e6..c1d80458f49 100644
--- a/lib/sidebars/groups/menus/ci_cd_menu.rb
+++ b/lib/sidebars/groups/menus/ci_cd_menu.rb
@@ -29,7 +29,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Runners'),
             link: group_runners_path(context.group),
-            active_routes: { path: 'groups/runners#index' },
+            active_routes: { controller: 'groups/runners' },
             item_id: :runners
           )
         end
diff --git a/lib/sidebars/groups/menus/settings_menu.rb b/lib/sidebars/groups/menus/settings_menu.rb
index 810b467ed2d..09226256476 100644
--- a/lib/sidebars/groups/menus/settings_menu.rb
+++ b/lib/sidebars/groups/menus/settings_menu.rb
@@ -89,10 +89,16 @@ module Sidebars
         end
 
         def ci_cd_menu_item
+          active_routes_path = if Feature.enabled?(:runner_list_group_view_vue_ui, context.group, default_enabled: :yaml)
+                                 'ci_cd#show'
+                               else
+                                 %w[ci_cd#show groups/runners#show groups/runners#edit]
+                               end
+
           ::Sidebars::MenuItem.new(
             title: _('CI/CD'),
             link: group_settings_ci_cd_path(context.group),
-            active_routes: { path: %w[ci_cd#show groups/runners#show groups/runners#edit] },
+            active_routes: { path: active_routes_path },
             item_id: :ci_cd
           )
         end