diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-30 00:07:57 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-30 00:08:05 +0300 |
| commit | e53169c9702f1f4f25f8f1e91ed9ab7ace0a3d41 (patch) | |
| tree | 6a051e9da6794f0fc70fcf0dca018236dfb3dc30 /app/models/concerns/noteable.rb | |
| parent | 1ac12698c613774bdace72475573916c142a07e4 (diff) | |
Resolve N+1 query issue with discussions
Diffstat (limited to 'app/models/concerns/noteable.rb')
| -rw-r--r-- | app/models/concerns/noteable.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb index dd1e6630642..c7bdc997eca 100644 --- a/app/models/concerns/noteable.rb +++ b/app/models/concerns/noteable.rb @@ -43,7 +43,12 @@ module Noteable end def resolvable_discussions - @resolvable_discussions ||= discussion_notes.resolvable.discussions(self) + @resolvable_discussions ||= + if defined?(@discussions) + @discussions.select(&:resolvable?) + else + discussion_notes.resolvable.discussions(self) + end end def discussions_resolvable? |