summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-07-23 13:10:32 +0200
committerDouwe Maan <douwe@gitlab.com>2015-07-23 13:10:32 +0200
commit0484ae7e6a7f0e6301089cdf7ce3e8a17e9079b8 (patch)
treeae9e71cb5429777ca7aa631a43a0d2fb0d7f5aba /app
parent276ca427ea8c30b20881f466bb9137596174cdb4 (diff)
downloadgitlab-ce-0484ae7e6a7f0e6301089cdf7ce3e8a17e9079b8.tar.gz
Return true/false from AutoMergeService#merge!remove-source-branch
Diffstat (limited to 'app')
-rw-r--r--app/services/merge_requests/auto_merge_service.rb4
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