Add latest changes from gitlab-org/gitlab@master

4 files changed, 21 insertions, 5 deletions

diff --git a/lib/sidebars/groups/super_sidebar_menus/secure_menu.rb b/lib/sidebars/groups/super_sidebar_menus/secure_menu.rb
index bc4c69c461a..c79e7e379d0 100644
--- a/lib/sidebars/groups/super_sidebar_menus/secure_menu.rb
+++ b/lib/sidebars/groups/super_sidebar_menus/secure_menu.rb
@@ -17,9 +17,9 @@ module Sidebars
         override :configure_menu_items
         def configure_menu_items
           [
-            :audit_events,
             :security_dashboard,
             :vulnerability_report,
+            :audit_events,
             :compliance,
             :scan_policies
           ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
diff --git a/lib/sidebars/projects/menus/packages_registries_menu.rb b/lib/sidebars/projects/menus/packages_registries_menu.rb
index 980f13d81bd..31a1aa56ab5 100644
--- a/lib/sidebars/projects/menus/packages_registries_menu.rb
+++ b/lib/sidebars/projects/menus/packages_registries_menu.rb
@@ -10,6 +10,7 @@ module Sidebars
           add_item(container_registry_menu_item)
           add_item(infrastructure_registry_menu_item)
           add_item(harbor_registry_menu_item)
+          add_item(model_experiments_menu_item)
           true
         end
 
@@ -89,6 +90,20 @@ module Sidebars
           )
         end
 
+        def model_experiments_menu_item
+          if Feature.disabled?(:ml_experiment_tracking, context.project)
+            return ::Sidebars::NilMenuItem.new(item_id: :model_experiments)
+          end
+
+          ::Sidebars::MenuItem.new(
+            title: _('Model experiments'),
+            link: project_ml_experiments_path(context.project),
+            super_sidebar_parent: Sidebars::Projects::SuperSidebarMenus::AnalyzeMenu,
+            active_routes: { controller: %w[projects/ml/experiments projects/ml/candidates] },
+            item_id: :model_experiments
+          )
+        end
+
         def packages_registry_disabled?
           !::Gitlab.config.packages.enabled ||
             !can?(context.current_user, :read_package, context.project&.packages_policy_subject)
diff --git a/lib/sidebars/projects/super_sidebar_menus/analyze_menu.rb b/lib/sidebars/projects/super_sidebar_menus/analyze_menu.rb
index 2d1b4c0c495..78a988fffaf 100644
--- a/lib/sidebars/projects/super_sidebar_menus/analyze_menu.rb
+++ b/lib/sidebars/projects/super_sidebar_menus/analyze_menu.rb
@@ -25,7 +25,8 @@ module Sidebars
             :code_review,
             :merge_requests,
             :issues,
-            :insights
+            :insights,
+            :model_experiments
           ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
         end
       end
diff --git a/lib/sidebars/projects/super_sidebar_menus/secure_menu.rb b/lib/sidebars/projects/super_sidebar_menus/secure_menu.rb
index 8639e3dbb1d..2ca53ba0ce9 100644
--- a/lib/sidebars/projects/super_sidebar_menus/secure_menu.rb
+++ b/lib/sidebars/projects/super_sidebar_menus/secure_menu.rb
@@ -18,13 +18,13 @@ module Sidebars
         def configure_menu_items
           [
             :discover_project_security,
-            :audit_events,
             :dashboard,
             :vulnerability_report,
-            :on_demand_scans,
-            :scan_policies,
             :dependency_list,
             :license_compliance,
+            :audit_events,
+            :scan_policies,
+            :on_demand_scans,
             :configuration
           ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
         end