Commit 1338c7dd71555144286d751a5299366a5c13d2df
1 parent
48f741ee
Exists in
spb-stable
and in
3 other branches
Fix mr update issue if merge_request_diff missing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
3 additions
and
1 deletions
Show diff stats
app/models/merge_request.rb
| @@ -126,7 +126,9 @@ class MergeRequest < ActiveRecord::Base | @@ -126,7 +126,9 @@ class MergeRequest < ActiveRecord::Base | ||
| 126 | end | 126 | end |
| 127 | 127 | ||
| 128 | def reload_code | 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 | end | 132 | end |
| 131 | 133 | ||
| 132 | def check_if_can_be_merged | 134 | def check_if_can_be_merged |