diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /lib/sidebars | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'lib/sidebars')
4 files changed, 18 insertions, 12 deletions
diff --git a/lib/sidebars/groups/menus/packages_registries_menu.rb b/lib/sidebars/groups/menus/packages_registries_menu.rb index 61cd81711f8..873f11f8a5b 100644 --- a/lib/sidebars/groups/menus/packages_registries_menu.rb +++ b/lib/sidebars/groups/menus/packages_registries_menu.rb @@ -8,7 +8,7 @@ module Sidebars def configure_menu_items add_item(packages_registry_menu_item) add_item(container_registry_menu_item) - add_item(harbor_registry__menu_item) + add_item(harbor_registry_menu_item) add_item(dependency_proxy_menu_item) true end @@ -49,8 +49,10 @@ module Sidebars ) end - def harbor_registry__menu_item - if Feature.disabled?(:harbor_registry_integration) || context.group.harbor_integration.nil? + def harbor_registry_menu_item + if Feature.disabled?(:harbor_registry_integration) || + context.group.harbor_integration.nil? || + !context.group.harbor_integration.activated? return nil_menu_item(:harbor_registry) end diff --git a/lib/sidebars/projects/menus/infrastructure_menu.rb b/lib/sidebars/projects/menus/infrastructure_menu.rb index 63eea0ea500..2181d89262b 100644 --- a/lib/sidebars/projects/menus/infrastructure_menu.rb +++ b/lib/sidebars/projects/menus/infrastructure_menu.rb @@ -89,12 +89,12 @@ module Sidebars ::Sidebars::MenuItem.new( title: _('Google Cloud'), link: project_google_cloud_configuration_path(context.project), - active_routes: { controller: [ - :configuration, - :service_accounts, - :databases, - :deployments, - :gcp_regions + active_routes: { controller: %w[ + projects/google_cloud/configuration + projects/google_cloud/service_accounts + projects/google_cloud/databases + projects/google_cloud/deployments + projects/google_cloud/gcp_regions ] }, item_id: :google_cloud ) diff --git a/lib/sidebars/projects/menus/packages_registries_menu.rb b/lib/sidebars/projects/menus/packages_registries_menu.rb index 2ddffe42899..fc7c564574a 100644 --- a/lib/sidebars/projects/menus/packages_registries_menu.rb +++ b/lib/sidebars/projects/menus/packages_registries_menu.rb @@ -9,7 +9,7 @@ module Sidebars add_item(packages_registry_menu_item) add_item(container_registry_menu_item) add_item(infrastructure_registry_menu_item) - add_item(harbor_registry__menu_item) + add_item(harbor_registry_menu_item) true end @@ -65,8 +65,10 @@ module Sidebars ) end - def harbor_registry__menu_item - if Feature.disabled?(:harbor_registry_integration, context.project) || context.project.harbor_integration.nil? + def harbor_registry_menu_item + if Feature.disabled?(:harbor_registry_integration, context.project) || + context.project.harbor_integration.nil? || + !context.project.harbor_integration.activated? return ::Sidebars::NilMenuItem.new(item_id: :harbor_registry) end diff --git a/lib/sidebars/projects/menus/repository_menu.rb b/lib/sidebars/projects/menus/repository_menu.rb index 0a295f0f618..1b46323089c 100644 --- a/lib/sidebars/projects/menus/repository_menu.rb +++ b/lib/sidebars/projects/menus/repository_menu.rb @@ -85,6 +85,8 @@ module Sidebars end def contributors_menu_item + return false unless context.project.analytics_enabled? + ::Sidebars::MenuItem.new( title: _('Contributors'), link: project_graph_path(context.project, context.current_ref), |