diff options
| author | Micael Bergeron <mbergeron@gitlab.com> | 2017-10-12 13:14:27 +0000 |
|---|---|---|
| committer | Micael Bergeron <mbergeron@gitlab.com> | 2017-10-12 13:14:27 +0000 |
| commit | ba6f7699968c8d16512da6a98be314a97c2dcfd9 (patch) | |
| tree | a264278177d4637c47c80f3be440f66d646bcb29 | |
| parent | 371a77c0e15a167d7ca7ceed2cf39bdf99c1131a (diff) | |
| download | gitlab-ce-ba6f7699968c8d16512da6a98be314a97c2dcfd9.tar.gz | |
fix for discussion
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 89003d78c9f..e92055d239d 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -61,8 +61,6 @@ module MergeRequests MergeRequests::PostMergeService.new(project, current_user).execute(merge_request) if delete_source_branch? - # Verify again that the source branch can be removed, since branch may be protected, - # or the source branch may have been updated. DeleteBranchService.new(@merge_request.source_project, branch_deletion_user) .execute(merge_request.source_branch) end @@ -75,7 +73,10 @@ module MergeRequests def branch_deletion_user @merge_request.force_remove_source_branch? ? @merge_request.author : current_user end - + + # Verify again that the source branch can be removed, since branch may be protected, + # or the source branch may have been updated, or the user may not have permission + # def delete_source_branch? params.fetch('should_remove_source_branch', @merge_request.force_remove_source_branch?) && @merge_request.can_remove_source_branch?(branch_deletion_user) |