Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

2 files changed, 9 insertions, 2 deletions

diff --git a/app/services/protected_branches/cache_service.rb b/app/services/protected_branches/cache_service.rb
index af8c9ce74bb..4a9fc335421 100644
--- a/app/services/protected_branches/cache_service.rb
+++ b/app/services/protected_branches/cache_service.rb
@@ -81,7 +81,11 @@ module ProtectedBranches
     end
 
     def metrics
-      @metrics ||= Gitlab::Cache::Metrics.new(
+      @metrics ||= Gitlab::Cache::Metrics.new(cache_metadata)
+    end
+
+    def cache_metadata
+      Gitlab::Cache::Metadata.new(
         caller_id: Gitlab::ApplicationContext.current_context_attribute(:caller_id),
         cache_identifier: "#{self.class}#fetch",
         feature_category: :source_code_management,
diff --git a/app/services/protected_branches/destroy_service.rb b/app/services/protected_branches/destroy_service.rb
index a32a867491e..011dbf3515d 100644
--- a/app/services/protected_branches/destroy_service.rb
+++ b/app/services/protected_branches/destroy_service.rb
@@ -5,7 +5,10 @@ module ProtectedBranches
     def execute(protected_branch)
       raise Gitlab::Access::AccessDeniedError unless can?(current_user, :destroy_protected_branch, protected_branch)
 
-      protected_branch.destroy.tap { refresh_cache }
+      protected_branch.destroy.tap do
+        refresh_cache
+        after_execute
+      end
     end
   end
 end