Return true/false from AutoMergeService#merge!

0484ae7e · Douwe Maan · 276ca427 · 0484ae7e
Commit 0484ae7e authored Jul 23, 2015 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

app/services/merge_requests/auto_merge_service.rb app/services/merge_requests/auto_merge_service.rb +4 -0

No files found.
--- 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