Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 0 deletions

diff --git a/app/models/note.rb b/app/models/note.rb
index c75d6aa77e6..69b1d6f6fc3 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -135,6 +135,7 @@ class Note < ApplicationRecord
              project: [:project_members, :namespace, { group: [:group_members] }])
   end
   scope :with_metadata, -> { includes(:system_note_metadata) }
+  scope :with_web_entity_associations, -> { preload(:project, :author, :noteable) }
 
   scope :for_note_or_capitalized_note, ->(text) { where(note: [text, text.capitalize]) }
   scope :like_note_or_capitalized_note, ->(text) { where('(note LIKE ? OR note LIKE ?)', text, text.capitalize) }