Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

7 files changed, 26 insertions, 45 deletions

diff --git a/lib/sidebars/groups/menus/ci_cd_menu.rb b/lib/sidebars/groups/menus/ci_cd_menu.rb
index c1d80458f49..0c2995f95e6 100644
--- a/lib/sidebars/groups/menus/ci_cd_menu.rb
+++ b/lib/sidebars/groups/menus/ci_cd_menu.rb
@@ -35,8 +35,7 @@ module Sidebars
         end
 
         def show_runners?
-          can?(context.current_user, :read_group_runners, context.group) &&
-            Feature.enabled?(:runner_list_group_view_vue_ui, context.group, default_enabled: :yaml)
+          can?(context.current_user, :read_group_runners, context.group)
         end
       end
     end
diff --git a/lib/sidebars/groups/menus/kubernetes_menu.rb b/lib/sidebars/groups/menus/kubernetes_menu.rb
index 98ca7865995..0d845978a93 100644
--- a/lib/sidebars/groups/menus/kubernetes_menu.rb
+++ b/lib/sidebars/groups/menus/kubernetes_menu.rb
@@ -23,7 +23,7 @@ module Sidebars
         def render?
           clusterable = context.group
 
-          Feature.enabled?(:certificate_based_clusters, clusterable, default_enabled: :yaml, type: :ops) &&
+          clusterable.certificate_based_clusters_enabled? &&
             can?(context.current_user, :read_cluster, clusterable)
         end
 
diff --git a/lib/sidebars/groups/menus/settings_menu.rb b/lib/sidebars/groups/menus/settings_menu.rb
index 09226256476..18ff3ebc714 100644
--- a/lib/sidebars/groups/menus/settings_menu.rb
+++ b/lib/sidebars/groups/menus/settings_menu.rb
@@ -89,16 +89,10 @@ 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: active_routes_path },
+            active_routes: { path: 'ci_cd#show' },
             item_id: :ci_cd
           )
         end
diff --git a/lib/sidebars/projects/menus/infrastructure_menu.rb b/lib/sidebars/projects/menus/infrastructure_menu.rb
index 7bd9ac91efa..a98cc20d51a 100644
--- a/lib/sidebars/projects/menus/infrastructure_menu.rb
+++ b/lib/sidebars/projects/menus/infrastructure_menu.rb
@@ -9,7 +9,6 @@ module Sidebars
           return false unless context.project.feature_available?(:operations, context.current_user)
 
           add_item(kubernetes_menu_item)
-          add_item(serverless_menu_item)
           add_item(terraform_menu_item)
           add_item(google_cloud_menu_item)
 
@@ -63,19 +62,6 @@ module Sidebars
               auto_devops_help_path: help_page_path('topics/autodevops/index.md') } }
         end
 
-        def serverless_menu_item
-          unless Feature.enabled?(:deprecated_serverless, context.project, default_enabled: :yaml, type: :ops) && can?(context.current_user, :read_cluster, context.project)
-            return ::Sidebars::NilMenuItem.new(item_id: :serverless)
-          end
-
-          ::Sidebars::MenuItem.new(
-            title: _('Serverless platform'),
-            link: project_serverless_functions_path(context.project),
-            active_routes: { controller: :functions },
-            item_id: :serverless
-          )
-        end
-
         def terraform_menu_item
           unless can?(context.current_user, :read_terraform_state, context.project)
             return ::Sidebars::NilMenuItem.new(item_id: :terraform)
diff --git a/lib/sidebars/projects/menus/monitor_menu.rb b/lib/sidebars/projects/menus/monitor_menu.rb
index 59554726263..c35bc1f5481 100644
--- a/lib/sidebars/projects/menus/monitor_menu.rb
+++ b/lib/sidebars/projects/menus/monitor_menu.rb
@@ -58,7 +58,8 @@ module Sidebars
         end
 
         def logs_menu_item
-          if !can?(context.current_user, :read_environment, context.project) ||
+          if !Feature.enabled?(:monitor_logging, context.project) ||
+            !can?(context.current_user, :read_environment, context.project) ||
             !can?(context.current_user, :read_pod_logs, context.project)
             return ::Sidebars::NilMenuItem.new(item_id: :logs)
           end
@@ -72,7 +73,8 @@ module Sidebars
         end
 
         def tracing_menu_item
-          if !can?(context.current_user, :read_environment, context.project) ||
+          if !Feature.enabled?(:monitor_tracing, context.project) ||
+            !can?(context.current_user, :read_environment, context.project) ||
             !can?(context.current_user, :admin_project, context.project)
             return ::Sidebars::NilMenuItem.new(item_id: :tracing)
           end
diff --git a/lib/sidebars/projects/menus/settings_menu.rb b/lib/sidebars/projects/menus/settings_menu.rb
index 2411ca8263a..2b5b3cdbb22 100644
--- a/lib/sidebars/projects/menus/settings_menu.rb
+++ b/lib/sidebars/projects/menus/settings_menu.rb
@@ -14,9 +14,9 @@ module Sidebars
           add_item(access_tokens_menu_item)
           add_item(repository_menu_item)
           add_item(ci_cd_menu_item)
-          add_item(monitor_menu_item)
-          add_item(pages_menu_item)
           add_item(packages_and_registries_menu_item)
+          add_item(pages_menu_item)
+          add_item(monitor_menu_item)
           add_item(usage_quotas_menu_item)
 
           true
@@ -103,16 +103,17 @@ module Sidebars
           )
         end
 
-        def monitor_menu_item
-          if context.project.archived? || !can?(context.current_user, :admin_operations, context.project)
-            return ::Sidebars::NilMenuItem.new(item_id: :monitor)
+        def packages_and_registries_menu_item
+          if !Gitlab.config.registry.enabled ||
+            !can?(context.current_user, :destroy_container_image, context.project)
+            return ::Sidebars::NilMenuItem.new(item_id: :packages_and_registries)
           end
 
           ::Sidebars::MenuItem.new(
-            title: _('Monitor'),
-            link: project_settings_operations_path(context.project),
-            active_routes: { path: 'operations#show' },
-            item_id: :monitor
+            title: _('Packages & Registries'),
+            link: project_settings_packages_and_registries_path(context.project),
+            active_routes: { path: 'packages_and_registries#index' },
+            item_id: :packages_and_registries
           )
         end
 
@@ -129,17 +130,16 @@ module Sidebars
           )
         end
 
-        def packages_and_registries_menu_item
-          if !Gitlab.config.registry.enabled ||
-            !can?(context.current_user, :destroy_container_image, context.project)
-            return ::Sidebars::NilMenuItem.new(item_id: :packages_and_registries)
+        def monitor_menu_item
+          if context.project.archived? || !can?(context.current_user, :admin_operations, context.project)
+            return ::Sidebars::NilMenuItem.new(item_id: :monitor)
           end
 
           ::Sidebars::MenuItem.new(
-            title: _('Packages & Registries'),
-            link: project_settings_packages_and_registries_path(context.project),
-            active_routes: { path: 'packages_and_registries#index' },
-            item_id: :packages_and_registries
+            title: _('Monitor'),
+            link: project_settings_operations_path(context.project),
+            active_routes: { path: 'operations#show' },
+            item_id: :monitor
           )
         end
 
diff --git a/lib/sidebars/projects/panel.rb b/lib/sidebars/projects/panel.rb
index 6bb4fb52e2a..1af8e14f034 100644
--- a/lib/sidebars/projects/panel.rb
+++ b/lib/sidebars/projects/panel.rb
@@ -28,9 +28,9 @@ module Sidebars
         add_menu(Sidebars::Projects::Menus::CiCdMenu.new(context))
         add_menu(Sidebars::Projects::Menus::SecurityComplianceMenu.new(context))
         add_menu(Sidebars::Projects::Menus::DeploymentsMenu.new(context))
-        add_menu(Sidebars::Projects::Menus::MonitorMenu.new(context))
-        add_menu(Sidebars::Projects::Menus::InfrastructureMenu.new(context))
         add_menu(Sidebars::Projects::Menus::PackagesRegistriesMenu.new(context))
+        add_menu(Sidebars::Projects::Menus::InfrastructureMenu.new(context))
+        add_menu(Sidebars::Projects::Menus::MonitorMenu.new(context))
         add_menu(Sidebars::Projects::Menus::AnalyticsMenu.new(context))
         add_wiki_menus
         add_menu(Sidebars::Projects::Menus::SnippetsMenu.new(context))