diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-07-23 13:10:32 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-07-23 14:26:34 +0300 |
| commit | 529091b6a333905898ce9cc21d7a9b29452eadf5 (patch) | |
| tree | 2436af6aecf8937dbe882ee0273236e1761d52e0 | |
| parent | 81666b301a124e370ab965cd020b132ab824902d (diff) | |
| download | gitlab-ce-529091b6a333905898ce9cc21d7a9b29452eadf5.tar.gz | |
Return true/false from AutoMergeService#merge!
| -rw-r--r-- | app/services/merge_requests/auto_merge_service.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/merge_requests/auto_merge_service.rb b/app/services/merge_requests/auto_merge_service.rb index a5ee16e529c..db824d452d0 100644 --- a/app/services/merge_requests/auto_merge_service.rb +++ b/app/services/merge_requests/auto_merge_service.rb @@ -41,6 +41,10 @@ module MergeRequests if merge_request.remove_source_branch? DeleteBranchService.new(merge_request.source_project, current_user).execute(merge_request.source_branch) end + + true + else + false end end end |