From 40d26e25543cf91d07a64428d9ea6b410d01fa7f Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Fri, 17 Feb 2017 17:48:32 +0000 Subject: 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. --- app/services/merge_requests/merge_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 177b714b734..3da1b657a41 100644 --- 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 -- cgit v1.2.1