Make Delete Merged Branches handle wildcard protected branches correctly
The "Delete Merged Branches" button should filter out protected branches matching the wildcard patterns. Closes gitlab-org/gitlab-ce#35592.
This commit is contained in:
parent
1b117e7f2d
commit
35081a77b0
|
@ -11,7 +11,7 @@ class DeleteMergedBranchesService < BaseService
|
||||||
# Prevent deletion of branches relevant to open merge requests
|
# Prevent deletion of branches relevant to open merge requests
|
||||||
branches -= merge_request_branch_names
|
branches -= merge_request_branch_names
|
||||||
# Prevent deletion of protected branches
|
# Prevent deletion of protected branches
|
||||||
branches -= project.protected_branches.pluck(:name)
|
branches = branches.reject { |branch| project.protected_for?(branch) }
|
||||||
|
|
||||||
branches.each do |branch|
|
branches.each do |branch|
|
||||||
DeleteBranchService.new(project, current_user).execute(branch)
|
DeleteBranchService.new(project, current_user).execute(branch)
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Make Delete Merged Branches handle wildcard protected branches correctly
|
||||||
|
merge_request: 13251
|
||||||
|
author:
|
|
@ -32,6 +32,14 @@ describe DeleteMergedBranchesService do
|
||||||
expect(project.repository.branch_names).to include('improve/awesome')
|
expect(project.repository.branch_names).to include('improve/awesome')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'keeps wildcard protected branches' do
|
||||||
|
create(:protected_branch, project: project, name: 'improve/*')
|
||||||
|
|
||||||
|
service.execute
|
||||||
|
|
||||||
|
expect(project.repository.branch_names).to include('improve/awesome')
|
||||||
|
end
|
||||||
|
|
||||||
context 'user without rights' do
|
context 'user without rights' do
|
||||||
let(:user) { create(:user) }
|
let(:user) { create(:user) }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue