Fix merge service error with no source

This shouldn't be possible in CE, but is needed so that the code is the same in CE and EE.

Fix merge service error with no source
40d26e25 · Sean McGivern · 35824650 · 40d26e25
Commit 40d26e25 authored Feb 17, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

merge_service.rb app/services/merge_requests/merge_service.rb +1 -1

No files found.
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -18,7 +18,7 @@ module MergeRequests
      @source = find_merge_source

      unless @source
-        log_merge_error('No source for merge', save_message_on_model: true)
+        return log_merge_error('No source for merge', save_message_on_model: true)
      end

      merge_request.in_locked_state do