about summary refs log tree commit diff
path: root/app/serializers
diff options
context:
space:
mode:
authorIsatis <515462+Reverite@users.noreply.github.com>2018-04-04 13:25:34 -0700
committerEugen Rochko <eugen@zeonfederated.com>2018-04-04 22:25:34 +0200
commitb08ab329f4d149fd414e0539574f49062c571a8a (patch)
tree0e99cecdab27a0bbe4e745284726dcd1905f6fac /app/serializers
parentf1867a73881444dfed9e093425435681ee764922 (diff)
retrieve custom emoji list via API instead of before page load (#7047)
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/initial_state_serializer.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 216cf5446..3b908e224 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -4,12 +4,6 @@ class InitialStateSerializer < ActiveModel::Serializer
   attributes :meta, :compose, :accounts,
              :media_attachments, :settings, :push_subscription
 
-  has_many :custom_emojis, serializer: REST::CustomEmojiSerializer
-
-  def custom_emojis
-    CustomEmoji.local.where(disabled: false)
-  end
-
   def meta
     store = {
       streaming_api_base_url: Rails.configuration.x.streaming_api_base_url,