Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 5 insertions, 3 deletions

diff --git a/app/services/protected_branches/base_service.rb b/app/services/protected_branches/base_service.rb
index d26c1b148bf..951017b2d01 100644
--- a/app/services/protected_branches/base_service.rb
+++ b/app/services/protected_branches/base_service.rb
@@ -2,10 +2,12 @@
 
 module ProtectedBranches
   class BaseService < ::BaseService
+    attr_reader :project_or_group
+
     # current_user - The user that performs the action
     # params - A hash of parameters
-    def initialize(project, current_user = nil, params = {})
-      @project = project
+    def initialize(project_or_group, current_user = nil, params = {})
+      @project_or_group = project_or_group
       @current_user = current_user
       @params = params
     end
@@ -15,7 +17,7 @@ module ProtectedBranches
     end
 
     def refresh_cache
-      CacheService.new(@project, @current_user, @params).refresh
+      CacheService.new(@project_or_group, @current_user, @params).refresh
     end
   end
 end