diff options
| author | Micael Bergeron <mbergeron@gitlab.com> | 2017-10-12 13:16:00 +0000 |
|---|---|---|
| committer | Micael Bergeron <mbergeron@gitlab.com> | 2017-10-12 13:16:00 +0000 |
| commit | d1acadceb1216fbfb0a9783a6dc7fa72d849846f (patch) | |
| tree | b6763ca423cac5074298d1a3950f81a4a2656767 | |
| parent | ba6f7699968c8d16512da6a98be314a97c2dcfd9 (diff) | |
| download | gitlab-ce-34897-delete-branch-after-merge.tar.gz | |
fix a whitespace34897-delete-branch-after-merge
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index e92055d239d..8c5821aa870 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -73,7 +73,7 @@ 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 # |