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

When deleting merged branches, ignore protected tags

Closes #39732

See merge request gitlab-org/gitlab-ce!15252

app/services/delete_merged_branches_service.rb

@@ -13,7 +13,7 @@ class DeleteMergedBranchesService < BaseService
       # Prevent deletion of branches relevant to open merge requests
       branches -= merge_request_branch_names
       # Prevent deletion of protected branches
-      branches = branches.reject { |branch| project.protected_for?(branch) }
+      branches = branches.reject { |branch| ProtectedBranch.protected?(project, branch) }
 
       branches.each do |branch|
         DeleteBranchService.new(project, current_user).execute(branch)

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

+---
+title: When deleting merged branches, ignore protected tags
+merge_request: 15252
+author:
+type: fixed

spec/services/delete_merged_branches_service_spec.rb

@@ -42,6 +42,14 @@ describe DeleteMergedBranchesService do
       expect(project.repository.branch_names).to include('improve/awesome')
     end
 
+    it 'ignores protected tags' do
+      create(:protected_tag, project: project, name: 'improve/*')
+
+      service.execute
+
+      expect(project.repository.branch_names).not_to include('improve/awesome')
+    end
+
     context 'user without rights' do
       let(:user) { create(:user) }