Commit 19dcb081 authored by George Koltsov's avatar George Koltsov

Always return MR diff_refs if importing

This change fixes a bug that prevents projects being
imported when there are diff notes present in merge requests.

Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/63955
parent 3b423390
......@@ -588,6 +588,8 @@ class MergeRequest < ApplicationRecord
end
def diff_refs
return merge_request_diff.diff_refs if importing?
persisted? ? merge_request_diff.diff_refs : repository_diff_refs
end
......
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