summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-07 15:46:50 +0100
committerDouwe Maan <douwe@gitlab.com>2016-01-14 11:30:28 +0100
commit255445c363cf06ceb5dd796dd856ac030b6eaa64 (patch)
tree1cd09483817c87b82b2cae7fe05494d062dcef8d
parent2a20c0e590be2f673188f1a0d27409a714800c89 (diff)
downloadgitlab-ce-backport-ee.tar.gz
Param should be present, not just truthybackport-ee
-rw-r--r--app/services/merge_requests/merge_service.rb2
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 cabc3d8fabb..e8bef250d8b 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -44,7 +44,7 @@ module MergeRequests
def after_merge
MergeRequests::PostMergeService.new(project, current_user).execute(merge_request)
- if params[:should_remove_source_branch]
+ if params[:should_remove_source_branch].present?
DeleteBranchService.new(@merge_request.source_project, current_user).
execute(merge_request.source_branch)
end