diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-28 15:12:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 15:12:33 +0100 |
| commit | bb316faffff7a76bc89f7e942233f0e14caf60f5 (patch) | |
| tree | 260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /app/serializers/rest/status_serializer.rb | |
| parent | 0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff) | |
| parent | 050efbc12650feaac3e833c4dd740bf090e3dae1 (diff) | |
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest/status_serializer.rb')
| -rw-r--r-- | app/serializers/rest/status_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb index 7185121d6..a7b797368 100644 --- a/app/serializers/rest/status_serializer.rb +++ b/app/serializers/rest/status_serializer.rb @@ -23,7 +23,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 |