Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 5 insertions, 22 deletions

diff --git a/app/services/groups/open_issues_count_service.rb b/app/services/groups/open_issues_count_service.rb
index c18d239998b..17cf3d38987 100644
--- a/app/services/groups/open_issues_count_service.rb
+++ b/app/services/groups/open_issues_count_service.rb
@@ -3,15 +3,11 @@
 module Groups
   # Service class for counting and caching the number of open issues of a group.
   class OpenIssuesCountService < Groups::CountService
-    # TOTAL_COUNT_KEY includes confidential and hidden issues (admin)
-    # TOTAL_COUNT_WITHOUT_HIDDEN_KEY includes confidential issues but not hidden issues (reporter and above)
-    # PUBLIC_COUNT_WITHOUT_HIDDEN_KEY does not include confidential or hidden issues (guest)
-    TOTAL_COUNT_KEY = 'group_open_issues_including_hidden_count'
-    TOTAL_COUNT_WITHOUT_HIDDEN_KEY = 'group_open_issues_without_hidden_count'
-    PUBLIC_COUNT_WITHOUT_HIDDEN_KEY = 'group_open_public_issues_without_hidden_count'
+    PUBLIC_COUNT_KEY = 'group_public_open_issues_count'
+    TOTAL_COUNT_KEY = 'group_total_open_issues_count'
 
     def clear_all_cache_keys
-      [cache_key(TOTAL_COUNT_KEY), cache_key(TOTAL_COUNT_WITHOUT_HIDDEN_KEY), cache_key(PUBLIC_COUNT_WITHOUT_HIDDEN_KEY)].each do |key|
+      [cache_key(PUBLIC_COUNT_KEY), cache_key(TOTAL_COUNT_KEY)].each do |key|
         Rails.cache.delete(key)
       end
     end
@@ -19,19 +15,7 @@ module Groups
     private
 
     def cache_key_name
-      if include_hidden?
-        TOTAL_COUNT_KEY
-      elsif public_only?
-        PUBLIC_COUNT_WITHOUT_HIDDEN_KEY
-      else
-        TOTAL_COUNT_WITHOUT_HIDDEN_KEY
-      end
-    end
-
-    def include_hidden?
-      strong_memoize(:user_is_admin) do
-        user&.can_admin_all_resources?
-      end
+      public_only? ? PUBLIC_COUNT_KEY : TOTAL_COUNT_KEY
     end
 
     def public_only?
@@ -51,8 +35,7 @@ module Groups
         state: 'opened',
         non_archived: true,
         include_subgroups: true,
-        public_only: public_only?,
-        include_hidden: include_hidden?
+        public_only: public_only?
       ).execute
     end