diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-02 17:17:54 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-02 17:17:54 +0100 |
| commit | 5a4a08249055022e9e6e30d9ab38c45c1bf71842 (patch) | |
| tree | eda99155dee262f3965a7938c9184e73022cf48a /app/models/note.rb | |
| parent | e591401b0b3f08baf4cd28d0fcb8e184a515fc74 (diff) | |
| parent | aea03d7cdfb882762426dbb5cab805682afe5e2a (diff) | |
| download | gitlab-ce-5a4a08249055022e9e6e30d9ab38c45c1bf71842.tar.gz | |
Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-for-issues-9-3
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 9320bbec314..563af47f314 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -111,7 +111,7 @@ class Note < ActiveRecord::Base end def discussions(context_noteable = nil) - Discussion.build_collection(fresh, context_noteable) + Discussion.build_collection(all.includes(:noteable).fresh, context_noteable) end def find_discussion(discussion_id) |