From 61a90186070395e133ad2f8e959bdf003a8615ca Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 6 May 2018 11:48:51 +0200
Subject: Enable custom emojis in profiles (notes, field values, display names)
 (#7374)

Follow-up to #6124
---
 app/serializers/rest/account_serializer.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/serializers/rest')

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
-- 
cgit