diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 444d6ab469b..c6d2f74f2b8 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -126,7 +126,9 @@ class MergeRequest < ActiveRecord::Base end def reload_code - merge_request_diff.reload_content if opened? + if merge_request_diff && opened? + merge_request_diff.reload_content + end end def check_if_can_be_merged