From f1bc90ab508cbdebc646324f87db48a9e80036f4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 28 Mar 2019 04:44:59 +0100
Subject: Rename :poll to :preloadable_poll and :owned_poll to :poll on Status
 (#10401)

Also, fix some n+1 queries

Resolve #10365
---
 app/serializers/rest/status_serializer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/serializers/rest/status_serializer.rb')

diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 30edf397b..106777b6e 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -21,7 +21,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   has_many :emojis, serializer: REST::CustomEmojiSerializer
 
   has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
-  has_one :poll, serializer: REST::PollSerializer
+  has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer
 
   def id
     object.id.to_s
-- 
cgit