diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-03 22:18:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 22:18:23 +0100 |
| commit | 230a012f0090c496fc5cdb011bcc8ed732fd0f5c (patch) | |
| tree | ca589b040b2d5c440e75e53d528f908cafe65d3a /app/serializers/rest/status_serializer.rb | |
| parent | 99dc212ae5d7b2527d835744bf903293398ce946 (diff) | |
Add polls (#10111)
* Add polls Fix #1629 * Add tests * Fixes * Change API for creating polls * Use name instead of content for votes * Remove poll validation for remote polls * Add polls to public pages * When updating the poll, update options just in case they were changed * Fix public pages showing both poll and other media
Diffstat (limited to 'app/serializers/rest/status_serializer.rb')
| -rw-r--r-- | app/serializers/rest/status_serializer.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb index 66e19be56..30edf397b 100644 --- a/app/serializers/rest/status_serializer.rb +++ b/app/serializers/rest/status_serializer.rb @@ -21,6 +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 def id object.id.to_s |