diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-28 04:44:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 04:44:59 +0100 |
| commit | f1bc90ab508cbdebc646324f87db48a9e80036f4 (patch) | |
| tree | c9e6fff16d8e69ed99e7010cabd4d83d595e5493 /app/models/notification.rb | |
| parent | f46f67d984e4e2deb4bf98cd5c5de813caf66eca (diff) | |
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)
Also, fix some n+1 queries Resolve #10365
Diffstat (limited to 'app/models/notification.rb')
| -rw-r--r-- | app/models/notification.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/notification.rb b/app/models/notification.rb index 982136c05..300269e24 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -25,7 +25,7 @@ class Notification < ApplicationRecord poll: 'Poll', }.freeze - STATUS_INCLUDES = [:account, :application, :media_attachments, :tags, active_mentions: :account, reblog: [:account, :application, :media_attachments, :tags, active_mentions: :account]].freeze + STATUS_INCLUDES = [:account, :application, :preloadable_poll, :media_attachments, :tags, active_mentions: :account, reblog: [:account, :application, :preloadable_poll, :media_attachments, :tags, active_mentions: :account]].freeze belongs_to :account, optional: true belongs_to :from_account, class_name: 'Account', optional: true |