diff options
author | Robert Speicher <robert@gitlab.com> | 2018-02-13 16:17:38 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-02-13 16:17:38 +0000 |
commit | 2007927956ad2ed6cce6202ab57a5f4e9f0c7faa (patch) | |
tree | 08302b19beb6551d678c6dd129d5e0395be1dc28 /app/services | |
parent | 9122b2fc619dca82225c2551a6215490e842f2e7 (diff) | |
parent | 50749135aa689c09dece150fb903bd3176de72e2 (diff) | |
download | gitlab-ce-2007927956ad2ed6cce6202ab57a5f4e9f0c7faa.tar.gz |
Merge branch 'fix/remove-allow-n-plus-1-from-delete-merged-branches-service' into 'master'
Remove allow_n_plus_1 block from DeleteMergedBranchesService
Closes #37438 and gitaly#999
See merge request gitlab-org/gitlab-ce!17058
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/delete_merged_branches_service.rb | 18 |
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 |