diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-24 14:38:02 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-24 14:38:02 +0200 |
| commit | 1338c7dd71555144286d751a5299366a5c13d2df (patch) | |
| tree | 720beaa21430687319025f1c586e5963a2b4b6cc | |
| parent | 48f741eed9f3676a8d0d089d7336fcffd31ebaa7 (diff) | |
| download | gitlab-ce-1338c7dd71555144286d751a5299366a5c13d2df.tar.gz | |
Fix mr update issue if merge_request_diff missing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 |