diff options
| author | Toon Claes <toon@iotcl.com> | 2017-07-04 12:51:00 +0300 |
|---|---|---|
| committer | Toon Claes <toon@iotcl.com> | 2017-07-04 13:14:40 +0300 |
| commit | e0f106ae97334d622c6eb7580e72e17181fddd6e (patch) | |
| tree | 2d1c439e97685bc167c832cfd3a93fdf2b505281 /app/services/delete_merged_branches_service.rb | |
| parent | f8973d76bd399a7c3638133bb75b2158faad7bf4 (diff) | |
DeleteMergedBranchesService should not delete protected branches
When deleting all the branches that are merged, the protected branches
should not be deleted.
Diffstat (limited to 'app/services/delete_merged_branches_service.rb')
| -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) |