Merge branch 'tc-fix-wildcard-protected-delete-merged' into 'master'

app/services/delete_merged_branches_service.rb

@@ -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)

changelogs/unreleased/tc-fix-wildcard-protected-delete-merged.yml

+---
+title: Make Delete Merged Branches handle wildcard protected branches correctly
+merge_request: 13251
+author:

spec/services/delete_merged_branches_service_spec.rb

@@ -32,6 +32,14 @@ describe DeleteMergedBranchesService, services: true 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) }