From c1a7bcdf1bfef9455bc58b1737f52530bf681a90 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 12 Apr 2023 15:15:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/sidebars/projects/menus/issues_menu.rb | 3 ++- lib/sidebars/projects/menus/merge_requests_menu.rb | 3 ++- lib/sidebars/projects/menus/packages_registries_menu.rb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/sidebars/projects') diff --git a/lib/sidebars/projects/menus/issues_menu.rb b/lib/sidebars/projects/menus/issues_menu.rb index a7f9ddde247..38eab0e3b68 100644 --- a/lib/sidebars/projects/menus/issues_menu.rb +++ b/lib/sidebars/projects/menus/issues_menu.rb @@ -57,7 +57,8 @@ module Sidebars override :pill_count def pill_count strong_memoize(:pill_count) do - context.project.open_issues_count(context.current_user) + count = context.project.open_issues_count(context.current_user) + format_cached_count(1000, count) end end diff --git a/lib/sidebars/projects/menus/merge_requests_menu.rb b/lib/sidebars/projects/menus/merge_requests_menu.rb index cc7fda0c920..be80a58d5f1 100644 --- a/lib/sidebars/projects/menus/merge_requests_menu.rb +++ b/lib/sidebars/projects/menus/merge_requests_menu.rb @@ -46,7 +46,8 @@ module Sidebars override :pill_count def pill_count - @pill_count ||= context.project.open_merge_requests_count + count = @pill_count ||= context.project.open_merge_requests_count + format_cached_count(1000, count) end override :pill_html_options diff --git a/lib/sidebars/projects/menus/packages_registries_menu.rb b/lib/sidebars/projects/menus/packages_registries_menu.rb index d5b590a03aa..b75445cdc5c 100644 --- a/lib/sidebars/projects/menus/packages_registries_menu.rb +++ b/lib/sidebars/projects/menus/packages_registries_menu.rb @@ -65,7 +65,7 @@ module Sidebars end ::Sidebars::MenuItem.new( - title: _('Infrastructure Registry'), + title: _('Terraform modules'), link: project_infrastructure_registry_index_path(context.project), super_sidebar_parent: Sidebars::Projects::SuperSidebarMenus::OperationsMenu, active_routes: { controller: :infrastructure_registry }, -- cgit v1.2.1