kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix merge service error with no source

Browse source 
This shouldn't be possible in CE, but is needed so that the code is the
same in CE and EE.
This commit is contained in:
Sean McGivern 2017-02-17 17:48:32 +00:00
parent 3582465043
commit 40d26e2554
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/merge_requests/merge_service.rb
View file

@ -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