about summary refs log tree commit diff
path: root/app/serializers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-05-06 11:48:51 +0200
committerGitHub <noreply@github.com>2018-05-06 11:48:51 +0200
commit61a90186070395e133ad2f8e959bdf003a8615ca (patch)
tree49596898f7e5c72116db1d181847f5925a033c59 /app/serializers
parentbd10a7e48076c913a652c347b0477496be8813fa (diff)
Enable custom emojis in profiles (notes, field values, display names) (#7374)
Follow-up to #6124
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/rest/account_serializer.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index 863238eb7..8761bbb5e 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -8,6 +8,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
              :followers_count, :following_count, :statuses_count
 
   has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested?
+  has_many :emojis, serializer: REST::CustomEmojiSerializer
 
   class FieldSerializer < ActiveModel::Serializer
     attributes :name, :value