Merge branch 'master' into glitch-soc/merge-upstream

2019-03-20 17:32:39 +01:00
parent 803c350ef5 80f0910e21
commit cbf1d711ba
11 changed files with 50 additions and 12 deletions
--- 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?