diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 20:12:35 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 20:12:35 +0300 |
| commit | 63e532eff01ac927e7fa39781d9ebd61503c9a3e (patch) | |
| tree | bc624a561827c3022be8787f26aae518a5ba3f58 /app/models | |
| parent | 967d42e0c8701c82d7d7494b1fd1d96cd4f2973f (diff) | |
| download | gitlab-ce-63e532eff01ac927e7fa39781d9ebd61503c9a3e.tar.gz | |
Cache MR diffs result. Improve diff output
Diffstat (limited to 'app/models')
| -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? |