Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

3 files changed, 23 insertions, 2 deletions

diff --git a/lib/sidebars/projects/menus/deployments_menu.rb b/lib/sidebars/projects/menus/deployments_menu.rb
index 110d78367b9..24e58e71023 100644
--- a/lib/sidebars/projects/menus/deployments_menu.rb
+++ b/lib/sidebars/projects/menus/deployments_menu.rb
@@ -27,7 +27,7 @@ module Sidebars
 
         override :sprite_icon
         def sprite_icon
-          'environment'
+          'deployments'
         end
 
         private
diff --git a/lib/sidebars/projects/menus/infrastructure_menu.rb b/lib/sidebars/projects/menus/infrastructure_menu.rb
index e26bb2237e6..92e9cbb7040 100644
--- a/lib/sidebars/projects/menus/infrastructure_menu.rb
+++ b/lib/sidebars/projects/menus/infrastructure_menu.rb
@@ -11,6 +11,7 @@ module Sidebars
           add_item(kubernetes_menu_item)
           add_item(serverless_menu_item)
           add_item(terraform_menu_item)
+          add_item(google_cloud_menu_item)
 
           true
         end
@@ -87,6 +88,22 @@ module Sidebars
             item_id: :terraform
           )
         end
+
+        def google_cloud_menu_item
+          feature_is_enabled = Feature.enabled?(:incubation_5mp_google_cloud)
+          user_has_permissions = can?(context.current_user, :manage_project_google_cloud, context.project)
+
+          unless feature_is_enabled && user_has_permissions
+            return ::Sidebars::NilMenuItem.new(item_id: :incubation_5mp_google_cloud)
+          end
+
+          ::Sidebars::MenuItem.new(
+            title: _('Google Cloud'),
+            link: project_google_cloud_index_path(context.project),
+            active_routes: {},
+            item_id: :google_cloud
+          )
+        end
       end
     end
   end
diff --git a/lib/sidebars/projects/menus/scope_menu.rb b/lib/sidebars/projects/menus/scope_menu.rb
index 539912aa77b..35502c7ea09 100644
--- a/lib/sidebars/projects/menus/scope_menu.rb
+++ b/lib/sidebars/projects/menus/scope_menu.rb
@@ -28,7 +28,11 @@ module Sidebars
 
         override :extra_nav_link_html_options
         def extra_nav_link_html_options
-          { class: 'context-header' }
+          {
+            class: 'context-header has-tooltip',
+            title: context.project.name,
+            data: { container: 'body', placement: 'right' }
+          }
         end
 
         override :render?