Move includes call to scope

app/models/discussion.rb

@@ -21,7 +21,7 @@ class Discussion
   end
   def self.build_collection(notes, context_noteable = nil)
-    grouped_notes = notes.includes(:noteable).group_by { |n| n.discussion_id(context_noteable) }
+    grouped_notes = notes.group_by { |n| n.discussion_id(context_noteable) }
     grouped_notes.values.map { |notes| build(notes, context_noteable) }
   end

app/models/note.rb

@@ -110,7 +110,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)