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

Avoidp loading merge request diff files when not needed

Browse source
This commit is contained in:
Stan Hu 2018-11-01 07:50:39 -07:00
parent 0844ba04b5
commit de1db4972c
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/merge_requests/reload_diffs_service.rb
View file

@ -38,7 +38,7 @@ module MergeRequests
# reloading the diff. # reloading the diff.
MergeRequestDiff MergeRequestDiff
.where(merge_request: merge_request) .where(merge_request: merge_request)
.preload(:merge_request_diff_files, merge_request: :target_project) .preload(merge_request: :target_project)
.find_each do |merge_request_diff| .find_each do |merge_request_diff|
next if merge_request_diff == new_diff next if merge_request_diff == new_diff

7
lib/gitlab/diff/file_collection/base.rb
View file

@ -17,7 +17,6 @@ module Gitlab
@diffable = diffable @diffable = diffable
@include_stats = diff_options.delete(:include_stats) @include_stats = diff_options.delete(:include_stats)
@diffs = diffable.raw_diffs(diff_options)
@project = project @project = project
@diff_options = diff_options @diff_options = diff_options
@diff_refs = diff_refs @diff_refs = diff_refs
@ -25,8 +24,12 @@ module Gitlab
@repository = project.repository @repository = project.repository
end end
def diffs
@diffs ||= diffable.raw_diffs(diff_options)
end
def diff_files def diff_files
@diff_files ||= @diffs.decorate! { |diff| decorate_diff!(diff) } @diff_files ||= diffs.decorate! { |diff| decorate_diff!(diff) }
end end
def diff_file_with_old_path(old_path) def diff_file_with_old_path(old_path)