Skip to content
Snippets Groups Projects
Commit 35081a77 authored by Toon Claes's avatar Toon Claes
Browse files

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.
parent 1b117e7f
No related branches found
No related tags found
2 merge requests!14773Maxraab master patch 51809,!13251Make Delete Merged Branches handle wildcard protected branches correctly
Pipeline #
Loading
Loading
@@ -11,7 +11,7 @@ class DeleteMergedBranchesService < BaseService
# Prevent deletion of branches relevant to open merge requests
branches -= merge_request_branch_names
# Prevent deletion of protected branches
branches -= project.protected_branches.pluck(:name)
branches = branches.reject { |branch| project.protected_for?(branch) }
 
branches.each do |branch|
DeleteBranchService.new(project, current_user).execute(branch)
Loading
Loading
---
title: Make Delete Merged Branches handle wildcard protected branches correctly
merge_request: 13251
author:
Loading
Loading
@@ -32,6 +32,14 @@ describe DeleteMergedBranchesService do
expect(project.repository.branch_names).to include('improve/awesome')
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
let(:user) { create(:user) }
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment