diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-28 15:54:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-28 15:54:10 +0200 |
| commit | e64e6a03dd1e0978fee48f0596dcfbc7fd29958f (patch) | |
| tree | d3a3da3ebed0fc4b942993bab88240f360903686 /app/controllers/api | |
| parent | 072158ee973f8e09a0abd34a825d9bce038a5d68 (diff) | |
Add categories for custom emojis (#11196)
Fix #7940
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/v1/custom_emojis_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb index 1bb19a09d..b6877fb3c 100644 --- a/app/controllers/api/v1/custom_emojis_controller.rb +++ b/app/controllers/api/v1/custom_emojis_controller.rb @@ -7,7 +7,7 @@ class Api::V1::CustomEmojisController < Api::BaseController def index render_cached_json('api:v1:custom_emojis', expires_in: 1.minute) do - ActiveModelSerializers::SerializableResource.new(CustomEmoji.local.where(disabled: false), each_serializer: REST::CustomEmojiSerializer) + ActiveModelSerializers::SerializableResource.new(CustomEmoji.local.where(disabled: false).includes(:category), each_serializer: REST::CustomEmojiSerializer) end end end |