Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

3 files changed, 47 insertions, 6 deletions

diff --git a/lib/sidebars/projects/menus/analytics_menu.rb b/lib/sidebars/projects/menus/analytics_menu.rb
index 2a89dc66219..b9bcc3267d6 100644
--- a/lib/sidebars/projects/menus/analytics_menu.rb
+++ b/lib/sidebars/projects/menus/analytics_menu.rb
@@ -10,9 +10,9 @@ module Sidebars
         def configure_menu_items
           return false unless can?(context.current_user, :read_analytics, context.project)
 
+          add_item(cycle_analytics_menu_item)
           add_item(ci_cd_analytics_menu_item)
           add_item(repository_analytics_menu_item)
-          add_item(cycle_analytics_menu_item)
 
           true
         end
diff --git a/lib/sidebars/projects/menus/infrastructure_menu.rb b/lib/sidebars/projects/menus/infrastructure_menu.rb
index ccc4787601a..1018bdd545b 100644
--- a/lib/sidebars/projects/menus/infrastructure_menu.rb
+++ b/lib/sidebars/projects/menus/infrastructure_menu.rb
@@ -57,9 +57,9 @@ module Sidebars
             data: { trigger: 'manual',
               container: 'body',
               placement: 'right',
-              highlight: UserCalloutsHelper::GKE_CLUSTER_INTEGRATION,
-              highlight_priority: UserCallout.feature_names[:GKE_CLUSTER_INTEGRATION],
-              dismiss_endpoint: user_callouts_path,
+              highlight: Users::CalloutsHelper::GKE_CLUSTER_INTEGRATION,
+              highlight_priority: Users::Callout.feature_names[:GKE_CLUSTER_INTEGRATION],
+              dismiss_endpoint: callouts_path,
               auto_devops_help_path: help_page_path('topics/autodevops/index.md') } }
         end
 
@@ -90,7 +90,7 @@ module Sidebars
         end
 
         def google_cloud_menu_item
-          feature_is_enabled = Feature.enabled?(:incubation_5mp_google_cloud)
+          feature_is_enabled = Feature.enabled?(:incubation_5mp_google_cloud, context.project)
           user_has_permissions = can?(context.current_user, :admin_project_google_cloud, context.project)
 
           unless feature_is_enabled && user_has_permissions
@@ -100,7 +100,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Google Cloud'),
             link: project_google_cloud_index_path(context.project),
-            active_routes: { controller: :google_cloud },
+            active_routes: { controller: [:google_cloud, :service_accounts] },
             item_id: :google_cloud
           )
         end
diff --git a/lib/sidebars/projects/menus/shimo_menu.rb b/lib/sidebars/projects/menus/shimo_menu.rb
new file mode 100644
index 00000000000..c93c4f6a0a4
--- /dev/null
+++ b/lib/sidebars/projects/menus/shimo_menu.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Projects
+    module Menus
+      class ShimoMenu < ::Sidebars::Menu
+        override :link
+        def link
+          project_integrations_shimo_path(context.project)
+        end
+
+        override :title
+        def title
+          s_('Shimo|Shimo')
+        end
+
+        override :image_path
+        def image_path
+          'logos/shimo.svg'
+        end
+
+        override :image_html_options
+        def image_html_options
+          {
+            size: 16
+          }
+        end
+
+        override :render?
+        def render?
+          context.project.has_shimo?
+        end
+
+        override :active_routes
+        def active_routes
+          { controller: :shimo }
+        end
+      end
+    end
+  end
+end