kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'tc-no-delete-protected-merged-branches' into 'master'

Browse source 
DeleteMergedBranchesService should not delete protected branches

Closes #34553

See merge request !12624
This commit is contained in:
Rémy Coutable 2017-07-04 11:26:15 +00:00
commit f7e7e40daf
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/delete_merged_branches_service.rb
View file

@ -10,6 +10,8 @@ class DeleteMergedBranchesService < BaseService
branches = branches.select { |branch| project.repository.merged_to_root_ref?(branch) } branches = branches.select { |branch| project.repository.merged_to_root_ref?(branch) }
# 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
branches -= project.protected_branches.pluck(:name)
branches.each do |branch| branches.each do |branch|
DeleteBranchService.new(project, current_user).execute(branch) DeleteBranchService.new(project, current_user).execute(branch)

4
changelogs/unreleased/tc-no-delete-protected-merged-branches.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Do not delete protected branches when deleting all merged branches
merge_request: 12624
author:

8
spec/services/delete_merged_branches_service_spec.rb
View file

@ -24,6 +24,14 @@ describe DeleteMergedBranchesService, services: true do
expect(project.repository.branch_names).to include('master') expect(project.repository.branch_names).to include('master')
end end
it 'keeps protected branches' do
create(:protected_branch, project: project, name: 'improve/awesome')
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) }