OSDN Git Service

Fix mr update issue if merge_request_diff missing
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 24 Jan 2014 12:38:02 +0000 (14:38 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 24 Jan 2014 12:38:02 +0000 (14:38 +0200)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
app/models/merge_request.rb

index 444d6ab..c6d2f74 100644 (file)
@@ -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