diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-20 17:29:12 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-20 17:29:12 +0100 |
| commit | 80f0910e2141b24082b9143266a9a6cf1ef6a516 (patch) | |
| tree | af7a96def3f54cdb4b8fcb11adc1ecb36166c529 /app/serializers/rest | |
| parent | 66d945209278c9344d503fe4e7a58d5c6f040e50 (diff) | |
Add support for custom emojis in poll options (#10322)
* Backend changes for custom emoji support in poll options * Serialize poll emojis in REST API * Render custom emojis in poll options * Render custom emoji in poll options on public pages
Diffstat (limited to 'app/serializers/rest')
| -rw-r--r-- | app/serializers/rest/poll_serializer.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/rest/poll_serializer.rb b/app/serializers/rest/poll_serializer.rb index 4dae1c09f..356c45b83 100644 --- a/app/serializers/rest/poll_serializer.rb +++ b/app/serializers/rest/poll_serializer.rb @@ -5,6 +5,7 @@ class REST::PollSerializer < ActiveModel::Serializer :multiple, :votes_count has_many :loaded_options, key: :options + has_many :emojis, serializer: REST::CustomEmojiSerializer attribute :voted, if: :current_user? |