diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-02 10:09:50 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-02 10:09:50 +0000 |
| commit | c0d30fad978de58da6d78d8fddcfccf602ebfe82 (patch) | |
| tree | a74fa73b1f14940935716988ca78e80e6bf5d010 /lib/gitlab/diff | |
| parent | 816700949028c556457d03fe134810ada2913eb7 (diff) | |
| parent | 9338c11f61432cccc939c0912877c1b128b9b668 (diff) | |
| download | gitlab-ce-c0d30fad978de58da6d78d8fddcfccf602ebfe82.tar.gz | |
Merge branch 'sh-optimize-reload-diffs-service' into 'master'
Significantly cut memory and SQL queries when reloading diffs
See merge request gitlab-org/gitlab-ce!22725
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/file_collection/base.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/gitlab/diff/file_collection/base.rb b/lib/gitlab/diff/file_collection/base.rb index b79ff771a2b..2ad6fe8449d 100644 --- a/lib/gitlab/diff/file_collection/base.rb +++ b/lib/gitlab/diff/file_collection/base.rb @@ -17,7 +17,6 @@ module Gitlab @diffable = diffable @include_stats = diff_options.delete(:include_stats) - @diffs = diffable.raw_diffs(diff_options) @project = project @diff_options = diff_options @diff_refs = diff_refs @@ -25,8 +24,12 @@ module Gitlab @repository = project.repository end + def diffs + @diffs ||= diffable.raw_diffs(diff_options) + end + def diff_files - @diff_files ||= @diffs.decorate! { |diff| decorate_diff!(diff) } + @diff_files ||= diffs.decorate! { |diff| decorate_diff!(diff) } end def diff_file_with_old_path(old_path) |