diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-15 09:15:10 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-15 09:15:10 +0000 |
| commit | d9a8d9f3de2705a3ab568532f3882dd23b3ce27a (patch) | |
| tree | dd99a05821ae140b9bf2ff917352046acc670154 /app/finders/notes_finder.rb | |
| parent | 6cb5b7c8729151c95d1610f0b2f7255fdac2bdec (diff) | |
| parent | 02d9f54f197a28f2d102b7346b1212edb7ddc117 (diff) | |
| download | gitlab-ce-d9a8d9f3de2705a3ab568532f3882dd23b3ce27a.tar.gz | |
Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'
Conflicts:
db/schema.rb
Diffstat (limited to 'app/finders/notes_finder.rb')
| -rw-r--r-- | app/finders/notes_finder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb index 12157818bcd..33ee1e975b9 100644 --- a/app/finders/notes_finder.rb +++ b/app/finders/notes_finder.rb @@ -57,7 +57,7 @@ class NotesFinder types = %w(commit issue merge_request snippet) note_relations = types.map { |t| notes_for_type(t) } note_relations.map! { |notes| search(notes) } - UnionFinder.new.find_union(note_relations, Note) + UnionFinder.new.find_union(note_relations, Note.includes(:author)) end def noteables_for_type(noteable_type) |