Commit 1338c7dd authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix mr update issue if merge_request_diff missing

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 48f741ee
...@@ -126,7 +126,9 @@ class MergeRequest < ActiveRecord::Base ...@@ -126,7 +126,9 @@ class MergeRequest < ActiveRecord::Base
end end
def reload_code def reload_code
merge_request_diff.reload_content if opened? if merge_request_diff && opened?
merge_request_diff.reload_content
end
end end
def check_if_can_be_merged def check_if_can_be_merged
......
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