diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-04 14:26:15 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-04 14:26:15 +0300 |
| commit | f7e7e40daf335570747b6f8893a63f1e9c91657a (patch) | |
| tree | b303136ba22c9b539d2f8437b7bf09a4aa03f21d /app | |
| parent | 75ac425c94d1763088040ff526b590f5ffe03f85 (diff) | |
| parent | e0f106ae97334d622c6eb7580e72e17181fddd6e (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) |