diff options
Diffstat (limited to 'app/models/merge_request.rb')
| -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 c45af9f713e..2a476355404 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -116,7 +116,7 @@ class MergeRequest < ActiveRecord::Base end def diffs - load_diffs(st_diffs) || [] + @diffs ||= (load_diffs(st_diffs) || []) end def reloaded_diffs @@ -128,6 +128,8 @@ class MergeRequest < ActiveRecord::Base def broken_diffs? diffs == broken_diffs + rescue + true end def valid_diffs? |