diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-12-16 19:00:43 +0300 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-12-21 21:59:21 +0300 |
commit | 7cf4947792647fd985c38ebf37c27989fd5a1632 (patch) | |
tree | 46bef7a798e8749e815f594a918266c8d9f9dd61 /app/models/note_diff_file.rb | |
parent | a9049532a271117983430d2d80b8ad61879ecf7a (diff) |
Cache diff highlight in discussions
This commit handles note diffs caching, which considerably improves
the performance on merge requests with lots of comments.
Important to note that the caching approach taken here is different
from `Gitlab::Diff::HighlightCache`. We do not reset the whole cache
when a new push is sent or anything else. That's because discussions
diffs are persisted and do not change.
Diffstat (limited to 'app/models/note_diff_file.rb')
-rw-r--r-- | app/models/note_diff_file.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/app/models/note_diff_file.rb b/app/models/note_diff_file.rb index 27aef7adc48..e369122003e 100644 --- a/app/models/note_diff_file.rb +++ b/app/models/note_diff_file.rb @@ -3,7 +3,22 @@ class NoteDiffFile < ActiveRecord::Base include DiffFile + scope :for_commit_or_unresolved, -> do + joins(:diff_note).where("resolved_at IS NULL OR noteable_type = 'Commit'") + end + + delegate :original_position, :project, to: :diff_note + belongs_to :diff_note, inverse_of: :note_diff_file validates :diff_note, presence: true + + def raw_diff_file + raw_diff = Gitlab::Git::Diff.new(to_hash) + + Gitlab::Diff::File.new(raw_diff, + repository: project.repository, + diff_refs: original_position.diff_refs, + unique_identifier: id) + end end |