diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-05 22:20:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 22:20:58 +0100 |
| commit | 772b4ba24c60e0394d25d0fad4eefb338a9befea (patch) | |
| tree | 804bb8ba01b1ff55471cc558d72456d2b9d0aea9 /app/serializers/rest/status_serializer.rb | |
| parent | 2a4ce7458a16c64029842fde210089453be2ede1 (diff) | |
| parent | 866496ac16b47ee17138db600519a630be833e4e (diff) | |
Merge pull request #935 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 | 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 b72eebb10..7185121d6 100644 --- a/app/serializers/rest/status_serializer.rb +++ b/app/serializers/rest/status_serializer.rb @@ -23,6 +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 def id object.id.to_s |