kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix mr update issue if merge_request_diff missing

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-01-24 14:38:02 +02:00
parent 48f741eed9
commit 1338c7dd71
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/merge_request.rb
View 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