diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 17:32:39 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 17:32:39 +0100 |
| commit | cbf1d711ba2fab4921bfcf57e7df0b952503f568 (patch) | |
| tree | a5b928c0da3b018c422b7337708d041bdb9be986 /app/serializers | |
| parent | 803c350ef5500229eafce222370c5f97a7532e41 (diff) | |
| parent | 80f0910e2141b24082b9143266a9a6cf1ef6a516 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/serializers')
| -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? |