tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)

Browse Source 
Also, fix some n+1 queries

Resolve #10365
This commit is contained in:
Eugen Rochko
2019-03-28 04:44:59 +01:00
committed by GitHub
parent f46f67d984
commit f1bc90ab50
15 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/notification.rb
View File

@ -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