diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-04 14:26:15 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-04 21:51:18 +0300 |
| commit | 896b1af85793451280f61d15ad2fa17a50b968a4 (patch) | |
| tree | d9dd28cb7bc29cc5414d1ca7e6fa3827d47a4d2e /app | |
| parent | dbc496077101fa93a4d814be74d126ef6865554f (diff) | |
Merge branch 'tc-no-delete-protected-merged-branches' into 'master'
DeleteMergedBranchesService should not delete protected branches
Closes #34553
See merge request !12624
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/delete_merged_branches_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/delete_merged_branches_service.rb b/app/services/delete_merged_branches_service.rb index 3b611588466..5c9e2a16c71 100644 --- a/app/services/delete_merged_branches_service.rb +++ b/app/services/delete_merged_branches_service.rb @@ -10,6 +10,8 @@ class DeleteMergedBranchesService < BaseService branches = branches.select { |branch| project.repository.merged_to_root_ref?(branch) } # 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.each do |branch| DeleteBranchService.new(project, current_user).execute(branch) |