Add latest changes from gitlab-org/gitlab@master

31 files changed, 230 insertions, 39 deletions

diff --git a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
index 66a31e97d9e..e717679e3dc 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
@@ -118,7 +118,6 @@
   redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_api_discovery
-  category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_fortify_fod_sast
@@ -452,10 +451,8 @@
   redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_terraform_module_base
-  category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_terraform_module
-  category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index 433bfae4a0a..e7e6c7046c7 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -182,7 +182,6 @@
   aggregation: daily
 # Runner group
 - name: g_runner_fleet_read_jobs_statistics
-  category: runner
   redis_slot: runner
   aggregation: weekly
 # Secrets Management
diff --git a/lib/gitlab/usage_data_counters/known_events/container_registry_events.yml b/lib/gitlab/usage_data_counters/known_events/container_registry_events.yml
index e8b14de1769..ac40079a6dc 100644
--- a/lib/gitlab/usage_data_counters/known_events/container_registry_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/container_registry_events.yml
@@ -1,22 +1,16 @@
 ---
 - name: i_container_registry_push_tag_user
-  category: user_container_registry
   aggregation: weekly
   redis_slot: container_registry
 - name: i_container_registry_delete_tag_user
-  category: user_container_registry
   aggregation: weekly
   redis_slot: container_registry
 - name: i_container_registry_push_repository_user
-  category: user_container_registry
   aggregation: weekly
   redis_slot: container_registry
 - name: i_container_registry_delete_repository_user
-  category: user_container_registry
   aggregation: weekly
   redis_slot: container_registry
 - name: i_container_registry_create_repository_user
-  category: user_container_registry
   aggregation: weekly
   redis_slot: container_registry
-  
\ No newline at end of file
diff --git a/lib/sidebars/concerns/super_sidebar_panel.rb b/lib/sidebars/concerns/super_sidebar_panel.rb
index 9303d91c0e7..5f3607debbc 100644
--- a/lib/sidebars/concerns/super_sidebar_panel.rb
+++ b/lib/sidebars/concerns/super_sidebar_panel.rb
@@ -5,10 +5,15 @@ module Sidebars
     # Contains helper methods aid conversion of a "normal" panel
     # into a Super Sidebar Panel
     module SuperSidebarPanel
-      # Picks an element from the given list and adds it to the current menus
-      # Used for menus which behave the same in the old nav and Supersidebar
-      def pick_from_old_menus(old_menus, element)
-        add_menu(remove_element(old_menus, element))
+      # Picks menus from a list and adds them to the current menu list
+      # if they should be picked into the super sidebar
+      def pick_from_old_menus(old_menus)
+        old_menus.select! do |menu|
+          next true unless menu.pick_into_super_sidebar?
+
+          add_menu(menu)
+          false
+        end
       end
 
       def transform_old_menus(current_menus, *old_menus)
diff --git a/lib/sidebars/groups/menus/ci_cd_menu.rb b/lib/sidebars/groups/menus/ci_cd_menu.rb
index 0c2995f95e6..f32bc49673f 100644
--- a/lib/sidebars/groups/menus/ci_cd_menu.rb
+++ b/lib/sidebars/groups/menus/ci_cd_menu.rb
@@ -21,6 +21,11 @@ module Sidebars
           'rocket'
         end
 
+        override :pick_into_super_sidebar?
+        def pick_into_super_sidebar?
+          true
+        end
+
         private
 
         def runners_menu_item
diff --git a/lib/sidebars/groups/menus/group_information_menu.rb b/lib/sidebars/groups/menus/group_information_menu.rb
index 3ce99e14a04..2364ad85cb5 100644
--- a/lib/sidebars/groups/menus/group_information_menu.rb
+++ b/lib/sidebars/groups/menus/group_information_menu.rb
@@ -28,6 +28,11 @@ module Sidebars
           { path: 'groups#subgroups' }
         end
 
+        override :serialize_as_menu_item_args
+        def serialize_as_menu_item_args
+          nil
+        end
+
         private
 
         def activity_menu_item
@@ -38,6 +43,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Activity'),
             link: activity_group_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
             active_routes: { path: 'groups#activity' },
             item_id: :activity
           )
@@ -51,6 +57,8 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Labels'),
             link: group_labels_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
+            super_sidebar_before: :activity,
             active_routes: { controller: :labels },
             item_id: :labels
           )
@@ -64,6 +72,8 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Members'),
             link: group_group_members_path(context.group),
+            sprite_icon: context.is_super_sidebar ? 'users' : nil,
+            super_sidebar_parent: ::Sidebars::StaticMenu,
             active_routes: { path: 'group_members#index' },
             item_id: :members
           )
diff --git a/lib/sidebars/groups/menus/issues_menu.rb b/lib/sidebars/groups/menus/issues_menu.rb
index 4044cb1c716..75bdb617b1a 100644
--- a/lib/sidebars/groups/menus/issues_menu.rb
+++ b/lib/sidebars/groups/menus/issues_menu.rb
@@ -49,12 +49,25 @@ module Sidebars
           }
         end
 
+        override :serialize_as_menu_item_args
+        def serialize_as_menu_item_args
+          super.merge({
+            active_routes: list_menu_item.active_routes,
+            sprite_icon: sprite_icon,
+            pill_count: pill_count,
+            has_pill: has_pill?,
+            super_sidebar_parent: ::Sidebars::StaticMenu,
+            item_id: :group_issue_list
+          })
+        end
+
         private
 
         def list_menu_item
           ::Sidebars::MenuItem.new(
             title: _('List'),
             link: issues_group_path(context.group),
+            super_sidebar_parent: ::Sidebars::NilMenuItem,
             active_routes: { path: 'groups#issues' },
             container_html_options: { aria: { label: _('Issues') } },
             item_id: :issue_list
@@ -66,11 +79,16 @@ module Sidebars
             return ::Sidebars::NilMenuItem.new(item_id: :boards)
           end
 
-          title = context.group.multiple_issue_boards_available? ? s_('IssueBoards|Boards') : s_('IssueBoards|Board')
+          title = if context.is_super_sidebar
+                    context.group.multiple_issue_boards_available? ? s_('Issue boards') : s_('Issue board')
+                  else
+                    context.group.multiple_issue_boards_available? ? s_('IssueBoards|Boards') : s_('IssueBoards|Board')
+                  end
 
           ::Sidebars::MenuItem.new(
             title: title,
             link: group_boards_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
             active_routes: { path: %w[boards#index boards#show] },
             item_id: :boards
           )
@@ -84,6 +102,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Milestones'),
             link: group_milestones_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
             active_routes: { path: 'milestones#index' },
             item_id: :milestones
           )
diff --git a/lib/sidebars/groups/menus/kubernetes_menu.rb b/lib/sidebars/groups/menus/kubernetes_menu.rb
index 0d845978a93..a7c14148230 100644
--- a/lib/sidebars/groups/menus/kubernetes_menu.rb
+++ b/lib/sidebars/groups/menus/kubernetes_menu.rb
@@ -38,6 +38,14 @@ module Sidebars
         def active_routes
           { controller: :clusters }
         end
+
+        override :serialize_as_menu_item_args
+        def serialize_as_menu_item_args
+          super.merge({
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::OperationsMenu,
+            item_id: :group_kubernetes_clusters
+          })
+        end
       end
     end
   end
diff --git a/lib/sidebars/groups/menus/merge_requests_menu.rb b/lib/sidebars/groups/menus/merge_requests_menu.rb
index 050cba07641..5e25c33167c 100644
--- a/lib/sidebars/groups/menus/merge_requests_menu.rb
+++ b/lib/sidebars/groups/menus/merge_requests_menu.rb
@@ -52,6 +52,17 @@ module Sidebars
         def active_routes
           { path: 'groups#merge_requests' }
         end
+
+        override :serialize_as_menu_item_args
+        def serialize_as_menu_item_args
+          super.merge({
+            sprite_icon: sprite_icon,
+            pill_count: pill_count,
+            has_pill: has_pill?,
+            super_sidebar_parent: ::Sidebars::StaticMenu,
+            item_id: :group_merge_request_list
+          })
+        end
       end
     end
   end
diff --git a/lib/sidebars/groups/menus/observability_menu.rb b/lib/sidebars/groups/menus/observability_menu.rb
index 0a5171eccfe..570a59f7e55 100644
--- a/lib/sidebars/groups/menus/observability_menu.rb
+++ b/lib/sidebars/groups/menus/observability_menu.rb
@@ -28,6 +28,11 @@ module Sidebars
           Gitlab::Observability.allowed_for_action?(context.current_user, context.group, :explore)
         end
 
+        override :pick_into_super_sidebar?
+        def pick_into_super_sidebar?
+          true
+        end
+
         private
 
         def dashboards_menu_item
diff --git a/lib/sidebars/groups/menus/packages_registries_menu.rb b/lib/sidebars/groups/menus/packages_registries_menu.rb
index e115ca669d4..73a67bf1142 100644
--- a/lib/sidebars/groups/menus/packages_registries_menu.rb
+++ b/lib/sidebars/groups/menus/packages_registries_menu.rb
@@ -23,6 +23,11 @@ module Sidebars
           'package'
         end
 
+        override :serialize_as_menu_item_args
+        def serialize_as_menu_item_args
+          nil
+        end
+
         private
 
         def packages_registry_menu_item
@@ -31,6 +36,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Package Registry'),
             link: group_packages_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::OperationsMenu,
             active_routes: { controller: 'groups/packages' },
             item_id: :packages_registry
           )
@@ -44,6 +50,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Container Registry'),
             link: group_container_registries_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::OperationsMenu,
             active_routes: { controller: 'groups/registry/repositories' },
             item_id: :container_registry
           )
@@ -59,6 +66,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Harbor Registry'),
             link: group_harbor_repositories_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::OperationsMenu,
             active_routes: { controller: 'groups/harbor/repositories' },
             item_id: :harbor_registry
           )
@@ -74,6 +82,8 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Dependency Proxy'),
             link: group_dependency_proxy_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::OperationsMenu,
+            super_sidebar_before: :packages_registry,
             active_routes: { controller: 'groups/dependency_proxies' },
             item_id: :dependency_proxy
           )
diff --git a/lib/sidebars/groups/menus/scope_menu.rb b/lib/sidebars/groups/menus/scope_menu.rb
index f6e0906dac4..5505f56a6d3 100644
--- a/lib/sidebars/groups/menus/scope_menu.rb
+++ b/lib/sidebars/groups/menus/scope_menu.rb
@@ -32,6 +32,16 @@ module Sidebars
         def render?
           true
         end
+
+        override :serialize_as_menu_item_args
+        def serialize_as_menu_item_args
+          super.merge({
+            title: _('Group overview'),
+            sprite_icon: 'group',
+            super_sidebar_parent: ::Sidebars::StaticMenu,
+            item_id: :group_overview
+          })
+        end
       end
     end
   end
diff --git a/lib/sidebars/groups/menus/settings_menu.rb b/lib/sidebars/groups/menus/settings_menu.rb
index 5b81f22c796..76c5f9c16a5 100644
--- a/lib/sidebars/groups/menus/settings_menu.rb
+++ b/lib/sidebars/groups/menus/settings_menu.rb
@@ -47,6 +47,11 @@ module Sidebars
           }
         end
 
+        override :pick_into_super_sidebar?
+        def pick_into_super_sidebar?
+          true
+        end
+
         private
 
         def general_menu_item
diff --git a/lib/sidebars/groups/panel.rb b/lib/sidebars/groups/panel.rb
index 45f24a3e7c4..e8b815bdce7 100644
--- a/lib/sidebars/groups/panel.rb
+++ b/lib/sidebars/groups/panel.rb
@@ -24,15 +24,6 @@ module Sidebars
         context.group.subgroup? ? _('Subgroup navigation') : _('Group navigation')
       end
 
-      override :super_sidebar_context_header
-      def super_sidebar_context_header
-        @super_sidebar_context_header ||= {
-          title: context.group.name,
-          avatar: context.group.avatar_url,
-          id: context.group.id
-        }
-      end
-
       private
 
       def add_invite_members_menu
diff --git a/lib/sidebars/groups/super_sidebar_menus/operations_menu.rb b/lib/sidebars/groups/super_sidebar_menus/operations_menu.rb
new file mode 100644
index 00000000000..195718e0681
--- /dev/null
+++ b/lib/sidebars/groups/super_sidebar_menus/operations_menu.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module SuperSidebarMenus
+      class OperationsMenu < ::Sidebars::Menu
+        override :title
+        def title
+          _('Operations')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'deployments'
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb b/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb
new file mode 100644
index 00000000000..8a90974c0d4
--- /dev/null
+++ b/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module SuperSidebarMenus
+      class PlanMenu < ::Sidebars::Menu
+        override :title
+        def title
+          _('Plan')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'planning'
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/super_sidebar_panel.rb b/lib/sidebars/groups/super_sidebar_panel.rb
new file mode 100644
index 00000000000..620f6e78eda
--- /dev/null
+++ b/lib/sidebars/groups/super_sidebar_panel.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    class SuperSidebarPanel < ::Sidebars::Groups::Panel
+      include ::Sidebars::Concerns::SuperSidebarPanel
+      extend ::Gitlab::Utils::Override
+
+      override :configure_menus
+      def configure_menus
+        super
+        old_menus = @menus
+        @menus = []
+
+        add_menu(Sidebars::StaticMenu.new(context))
+        add_menu(Sidebars::Groups::SuperSidebarMenus::PlanMenu.new(context))
+
+        pick_from_old_menus(old_menus)
+
+        insert_menu_before(
+          Sidebars::Groups::Menus::ObservabilityMenu,
+          Sidebars::Groups::SuperSidebarMenus::OperationsMenu.new(context)
+        )
+
+        insert_menu_before(
+          Sidebars::Groups::Menus::SettingsMenu,
+          Sidebars::UncategorizedMenu.new(context)
+        )
+
+        transform_old_menus(@menus, @scope_menu, *old_menus)
+      end
+
+      override :super_sidebar_context_header
+      def super_sidebar_context_header
+        {
+          title: context.group.name,
+          avatar: context.group.avatar_url,
+          id: context.group.id
+        }
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/menu.rb b/lib/sidebars/menu.rb
index 4af385030a8..03995362ff0 100644
--- a/lib/sidebars/menu.rb
+++ b/lib/sidebars/menu.rb
@@ -96,6 +96,10 @@ module Sidebars
       end
     end
 
+    def pick_into_super_sidebar?
+      false
+    end
+
     # Returns whether the menu has any renderable menu item
     def has_renderable_items?
       renderable_items.any?
diff --git a/lib/sidebars/projects/menus/analytics_menu.rb b/lib/sidebars/projects/menus/analytics_menu.rb
index 643b7ebcd5a..fae2efd91de 100644
--- a/lib/sidebars/projects/menus/analytics_menu.rb
+++ b/lib/sidebars/projects/menus/analytics_menu.rb
@@ -41,6 +41,11 @@ module Sidebars
           'chart'
         end
 
+        override :pick_into_super_sidebar?
+        def pick_into_super_sidebar?
+          true
+        end
+
         private
 
         def ci_cd_analytics_menu_item
diff --git a/lib/sidebars/projects/menus/ci_cd_menu.rb b/lib/sidebars/projects/menus/ci_cd_menu.rb
index 5df99bb9d84..3d11dba1089 100644
--- a/lib/sidebars/projects/menus/ci_cd_menu.rb
+++ b/lib/sidebars/projects/menus/ci_cd_menu.rb
@@ -39,6 +39,11 @@ module Sidebars
           'rocket'
         end
 
+        override :pick_into_super_sidebar?
+        def pick_into_super_sidebar?
+          true
+        end
+
         private
 
         def pipelines_menu_item
diff --git a/lib/sidebars/projects/menus/issues_menu.rb b/lib/sidebars/projects/menus/issues_menu.rb
index 21d42fa3879..6904dc129b7 100644
--- a/lib/sidebars/projects/menus/issues_menu.rb
+++ b/lib/sidebars/projects/menus/issues_menu.rb
@@ -74,7 +74,8 @@ module Sidebars
             sprite_icon: sprite_icon,
             pill_count: pill_count,
             has_pill: has_pill?,
-            super_sidebar_parent: ::Sidebars::StaticMenu
+            super_sidebar_parent: ::Sidebars::StaticMenu,
+            item_id: :project_issue_list
           })
         end
 
diff --git a/lib/sidebars/projects/menus/merge_requests_menu.rb b/lib/sidebars/projects/menus/merge_requests_menu.rb
index 1695d759ed2..cc7fda0c920 100644
--- a/lib/sidebars/projects/menus/merge_requests_menu.rb
+++ b/lib/sidebars/projects/menus/merge_requests_menu.rb
@@ -71,7 +71,8 @@ module Sidebars
             sprite_icon: sprite_icon,
             pill_count: pill_count,
             has_pill: has_pill?,
-            super_sidebar_parent: ::Sidebars::StaticMenu
+            super_sidebar_parent: ::Sidebars::StaticMenu,
+            item_id: :project_merge_request_list
           })
         end
       end
diff --git a/lib/sidebars/projects/menus/monitor_menu.rb b/lib/sidebars/projects/menus/monitor_menu.rb
index fea71e4aefd..333112e13b6 100644
--- a/lib/sidebars/projects/menus/monitor_menu.rb
+++ b/lib/sidebars/projects/menus/monitor_menu.rb
@@ -38,6 +38,11 @@ module Sidebars
           { controller: [:user, :gcp] }
         end
 
+        override :pick_into_super_sidebar?
+        def pick_into_super_sidebar?
+          true
+        end
+
         private
 
         def feature_enabled?
diff --git a/lib/sidebars/projects/menus/repository_menu.rb b/lib/sidebars/projects/menus/repository_menu.rb
index 5bfc9e727ff..158a29f0b31 100644
--- a/lib/sidebars/projects/menus/repository_menu.rb
+++ b/lib/sidebars/projects/menus/repository_menu.rb
@@ -44,6 +44,11 @@ module Sidebars
           'doc-text'
         end
 
+        override :pick_into_super_sidebar?
+        def pick_into_super_sidebar?
+          true
+        end
+
         private
 
         def files_menu_item
diff --git a/lib/sidebars/projects/menus/scope_menu.rb b/lib/sidebars/projects/menus/scope_menu.rb
index 77da695d49c..7e2286633e5 100644
--- a/lib/sidebars/projects/menus/scope_menu.rb
+++ b/lib/sidebars/projects/menus/scope_menu.rb
@@ -45,7 +45,8 @@ module Sidebars
           super.merge({
             title: _('Project overview'),
             sprite_icon: 'project',
-            super_sidebar_parent: ::Sidebars::StaticMenu
+            super_sidebar_parent: ::Sidebars::StaticMenu,
+            item_id: :project_overview
           })
         end
       end
diff --git a/lib/sidebars/projects/menus/security_compliance_menu.rb b/lib/sidebars/projects/menus/security_compliance_menu.rb
index 58a7ab4e8f0..eb713244a7c 100644
--- a/lib/sidebars/projects/menus/security_compliance_menu.rb
+++ b/lib/sidebars/projects/menus/security_compliance_menu.rb
@@ -25,6 +25,11 @@ module Sidebars
           'shield'
         end
 
+        override :pick_into_super_sidebar?
+        def pick_into_super_sidebar?
+          true
+        end
+
         private
 
         def configuration_menu_item
diff --git a/lib/sidebars/projects/menus/settings_menu.rb b/lib/sidebars/projects/menus/settings_menu.rb
index eea32d8b626..8b6d85e718d 100644
--- a/lib/sidebars/projects/menus/settings_menu.rb
+++ b/lib/sidebars/projects/menus/settings_menu.rb
@@ -44,6 +44,11 @@ module Sidebars
           'settings'
         end
 
+        override :pick_into_super_sidebar?
+        def pick_into_super_sidebar?
+          true
+        end
+
         private
 
         def general_menu_item
diff --git a/lib/sidebars/projects/menus/snippets_menu.rb b/lib/sidebars/projects/menus/snippets_menu.rb
index a1ba85e2b04..535f12963b1 100644
--- a/lib/sidebars/projects/menus/snippets_menu.rb
+++ b/lib/sidebars/projects/menus/snippets_menu.rb
@@ -40,7 +40,8 @@ module Sidebars
         def serialize_as_menu_item_args
           super.deep_merge({
             super_sidebar_parent: ::Sidebars::Projects::Menus::RepositoryMenu,
-            super_sidebar_before: :contributors
+            super_sidebar_before: :contributors,
+            item_id: :project_snippets
           })
         end
       end
diff --git a/lib/sidebars/projects/menus/wiki_menu.rb b/lib/sidebars/projects/menus/wiki_menu.rb
index 8bf223da4da..d800dae8be3 100644
--- a/lib/sidebars/projects/menus/wiki_menu.rb
+++ b/lib/sidebars/projects/menus/wiki_menu.rb
@@ -39,7 +39,8 @@ module Sidebars
         override :serialize_as_menu_item_args
         def serialize_as_menu_item_args
           super.merge({
-            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu
+            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+            item_id: :project_wiki
           })
         end
       end
diff --git a/lib/sidebars/projects/super_sidebar_panel.rb b/lib/sidebars/projects/super_sidebar_panel.rb
index 2f2f3714cef..f76f28eb642 100644
--- a/lib/sidebars/projects/super_sidebar_panel.rb
+++ b/lib/sidebars/projects/super_sidebar_panel.rb
@@ -14,15 +14,18 @@ module Sidebars
 
         add_menu(Sidebars::StaticMenu.new(context))
         add_menu(Sidebars::Projects::SuperSidebarMenus::PlanMenu.new(context))
-        # "Develop" menu
-        pick_from_old_menus(old_menus, Sidebars::Projects::Menus::RepositoryMenu)
-        pick_from_old_menus(old_menus, Sidebars::Projects::Menus::CiCdMenu)
-        pick_from_old_menus(old_menus, Sidebars::Projects::Menus::SecurityComplianceMenu)
-        add_menu(Sidebars::Projects::SuperSidebarMenus::OperationsMenu.new(context))
-        pick_from_old_menus(old_menus, Sidebars::Projects::Menus::MonitorMenu)
-        pick_from_old_menus(old_menus, Sidebars::Projects::Menus::AnalyticsMenu)
-        add_menu(Sidebars::UncategorizedMenu.new(context))
-        pick_from_old_menus(old_menus, Sidebars::Projects::Menus::SettingsMenu)
+
+        pick_from_old_menus(old_menus)
+
+        insert_menu_before(
+          Sidebars::Projects::Menus::MonitorMenu,
+          Sidebars::Projects::SuperSidebarMenus::OperationsMenu.new(context)
+        )
+
+        insert_menu_before(
+          Sidebars::Projects::Menus::SettingsMenu,
+          Sidebars::UncategorizedMenu.new(context)
+        )
 
         transform_old_menus(@menus, @scope_menu, *old_menus)
       end
diff --git a/lib/tasks/gitlab/usage_data.rake b/lib/tasks/gitlab/usage_data.rake
index 32db5e2dff6..b9d425a66c5 100644
--- a/lib/tasks/gitlab/usage_data.rake
+++ b/lib/tasks/gitlab/usage_data.rake
@@ -88,7 +88,6 @@ namespace :gitlab do
     def ci_template_event(event_name)
       {
         'name' => event_name,
-        'category' => 'ci_templates',
         'redis_slot' => Gitlab::UsageDataCounters::CiTemplateUniqueCounter::REDIS_SLOT,
         'aggregation' => 'weekly'
       }