Remove allow_n_plus_1 block from DeleteMergedBranchesServicefix/remove-allow-n-plus-1-from-delete-merged-branches-service

Fixes #37438
Fixes gitaly#999

1 files changed, 7 insertions, 11 deletions

diff --git a/app/services/delete_merged_branches_service.rb b/app/services/delete_merged_branches_service.rb
index cb235a85daf..c98d1e3c540 100644
--- a/app/services/delete_merged_branches_service.rb
+++ b/app/services/delete_merged_branches_service.rb
@@ -6,18 +6,14 @@ class DeleteMergedBranchesService < BaseService
   def execute
     raise Gitlab::Access::AccessDeniedError unless can?(current_user, :push_code, project)
 
-    # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37438
-    Gitlab::GitalyClient.allow_n_plus_1_calls do
-      branches = project.repository.branch_names
-      branches = branches.select { |branch| project.repository.merged_to_root_ref?(branch) }
-      # Prevent deletion of branches relevant to open merge requests
-      branches -= merge_request_branch_names
-      # Prevent deletion of protected branches
-      branches = branches.reject { |branch| ProtectedBranch.protected?(project, branch) }
+    branches = project.repository.merged_branch_names
+    # Prevent deletion of branches relevant to open merge requests
+    branches -= merge_request_branch_names
+    # Prevent deletion of protected branches
+    branches = branches.reject { |branch| ProtectedBranch.protected?(project, branch) }
 
-      branches.each do |branch|
-        DeleteBranchService.new(project, current_user).execute(branch)
-      end
+    branches.each do |branch|
+      DeleteBranchService.new(project, current_user).execute(branch)
     end
   end