diff options
| author | kedama <32974885+kedamaDQ@users.noreply.github.com> | 2017-11-07 22:24:21 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-11-07 14:24:21 +0100 |
| commit | d8cd9000d91aaebfa15865d0bcdfac4b59d3950f (patch) | |
| tree | bf946bacf292f7df7cf7e5b68cc3967e0ec4ff25 /app | |
| parent | d307ee79e9b2f783fbdc6fd2e174ec91c47e8e5e (diff) | |
Hide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613)
Make the same behavior as /api/v1/custom_emojis.
Diffstat (limited to 'app')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index a8db73161..4fa1981ed 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -7,7 +7,7 @@ class InitialStateSerializer < ActiveModel::Serializer has_many :custom_emojis, serializer: REST::CustomEmojiSerializer def custom_emojis - CustomEmoji.local + CustomEmoji.local.where(disabled: false) end def meta |