From 07c984d81cd7985d4ab7597cbb21b5f623b438e9 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 18 May 2017 13:24:34 +0100 Subject: Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. --- app/models/note.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/models/note.rb') diff --git a/app/models/note.rb b/app/models/note.rb index 60257aac93b..9320bbec314 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -13,6 +13,7 @@ class Note < ActiveRecord::Base include AfterCommitQueue include ResolvableNote include IgnorableColumn + include Editable ignore_column :original_discussion_id -- cgit v1.2.1 From 78207b95ca7795c82bfc14fdf35422714906b14d Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 31 May 2017 14:00:30 -0500 Subject: Move includes call to scope --- app/models/note.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/note.rb') diff --git a/app/models/note.rb b/app/models/note.rb index 60257aac93b..832c68243fb 100644 --- a/app/models/note.rb +++ b/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) -- cgit v1.2.1