提交 40d26e25 编写于 作者: S Sean McGivern

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.
上级 35824650
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册