diff options
| author | Reverite <github@reverite.sh> | 2019-03-21 15:35:55 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-03-21 15:35:55 -0700 |
| commit | 592735fd80acd0aeffb5a5674255ed48d7a8db0b (patch) | |
| tree | 0eefc67f624a07df0af860edecd68d5dc64c7ee9 /app/serializers/rest/poll_serializer.rb | |
| parent | 75eeb003b09c53d3b4e98046d1c20b0ad8a887bb (diff) | |
| parent | bde9196b70299405ebe9b16500b7a3f65539b2c3 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'app/serializers/rest/poll_serializer.rb')
| -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? |