Fix mr update issue if merge_request_diff missing

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix mr update issue if merge_request_diff missing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 48f741ee
Showing 1 changed file with 3 additions and 1 deletions Show diff stats
app/models/merge_request.rb
@@ -126,7 +126,9 @@ class MergeRequest &lt; 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
...	...	@@ -126,7 +126,9 @@ class MergeRequest < ActiveRecord::Base
126	126	end
127	127
128	128	def reload_code
129		- merge_request_diff.reload_content if opened?
	129	+ if merge_request_diff && opened?
	130	+ merge_request_diff.reload_content
	131	+ end
130	132	end
131	133
132	134	def check_if_can_be_merged
...	...