diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-02 14:14:51 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-02 14:14:51 +0000 |
| commit | 315c1ed140c5536edce46940f5f41f81e2680784 (patch) | |
| tree | 342ff65b722229f0815706e9e88f3f58f8d990de /app | |
| parent | 8ec089f3324ca6e181b575560c636c93bde6b52d (diff) | |
| parent | 35081a77b0527e606c0835a979403ec4d55564d5 (diff) | |
| download | gitlab-ce-315c1ed140c5536edce46940f5f41f81e2680784.tar.gz | |
Merge branch 'tc-fix-wildcard-protected-delete-merged' into 'master'
Make Delete Merged Branches handle wildcard protected branches correctly
Closes #35592
See merge request !13251
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/delete_merged_branches_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/delete_merged_branches_service.rb b/app/services/delete_merged_branches_service.rb index 5c9e2a16c71..ff11bd59d29 100644 --- a/app/services/delete_merged_branches_service.rb +++ b/app/services/delete_merged_branches_service.rb @@ -11,7 +11,7 @@ class DeleteMergedBranchesService < BaseService # 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 = branches.reject { |branch| project.protected_for?(branch) } branches.each do |branch| DeleteBranchService.new(project, current_user).execute(branch) |