Commit fc8d2fbc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Build diff_refs for merge request if merge request diff does not exist

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 7cb8ceb5
......@@ -250,6 +250,12 @@ class MergeRequest < ActiveRecord::Base
def diff_refs
if merge_request_diff
merge_request_diff.diff_refs
elsif diff_start_commit || diff_base_commit
Gitlab::Diff::DiffRefs.new(
base_sha: diff_base_sha,
start_sha: diff_start_sha,
head_sha: diff_head_sha
)
end
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