Merge branch 'fix-merge-service-with-no-source' into 'master'

Fix merge service error with no source See merge request !9348

Merge branch 'fix-merge-service-with-no-source' into 'master'
63cb6c84 · Rémy Coutable · 1fd90ef5 · 40d26e25 · 63cb6c84
Commit 63cb6c84 authored Feb 17, 2017 by Rémy Coutable
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