diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-20 20:13:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 20:13:22 +0100 |
| commit | bde9196b70299405ebe9b16500b7a3f65539b2c3 (patch) | |
| tree | 4bec904a28c70b916d18055f8291f17c2e58e07b /app/serializers/rest | |
| parent | b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (diff) | |
| parent | 8b5b686f087f99d1a2b54e0760add8180d77fa7e (diff) | |
Merge pull request #964 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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? |