diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-14 18:39:49 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-14 18:39:49 +0000 |
| commit | 65eae647a6adb293dd761541d7fa5910a821e842 (patch) | |
| tree | 386341bb99fd5c6aa66d6ac38752a6f954a192cd /app/services | |
| parent | 14695798fb7cc3e51c19d96df4a4dc5b14c2c6cf (diff) | |
| parent | 255445c363cf06ceb5dd796dd856ac030b6eaa64 (diff) | |
| download | gitlab-ce-65eae647a6adb293dd761541d7fa5910a821e842.tar.gz | |
Merge branch 'backport-ee' into 'master'
Backport two commits from EE
Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110
See merge request !2424
Diffstat (limited to 'app/services')
| -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 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 |