Commit 63cb6c84 authored by Rémy Coutable's avatar Rémy Coutable

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

Fix merge service error with no source

See merge request !9348
parents 1fd90ef5 40d26e25
...@@ -18,7 +18,7 @@ module MergeRequests ...@@ -18,7 +18,7 @@ module MergeRequests
@source = find_merge_source @source = find_merge_source
unless @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 end
merge_request.in_locked_state do merge_request.in_locked_state do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment