From 1338c7dd71555144286d751a5299366a5c13d2df Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 24 Jan 2014 14:38:02 +0200 Subject: [PATCH] Fix mr update issue if merge_request_diff missing Signed-off-by: Dmitriy Zaporozhets --- app/models/merge_request.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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