diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-02-17 17:48:32 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-02-17 17:48:32 +0000 |
| commit | 40d26e25543cf91d07a64428d9ea6b410d01fa7f (patch) | |
| tree | c78be778ef2fe28d6f47148e5835fde6e21cdd0c | |
| parent | 35824650433c319a817428029b096743a18caa6f (diff) | |
| download | gitlab-ce-fix-merge-service-with-no-source.tar.gz | |
Fix merge service error with no sourcefix-merge-service-with-no-source
This shouldn't be possible in CE, but is needed so that the code is the
same in CE and EE.
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |