diff options
| author | Reverite <github@reverite.sh> | 2019-06-28 22:48:00 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-28 22:48:00 -0700 |
| commit | 01e77afe9a0dc126506cfc98d8f5d330f4a2f076 (patch) | |
| tree | 387f07d7180c0852832f7923a34562c9f385d91f /app/controllers | |
| parent | 9861df046853b71370cede86afbba1a371714756 (diff) | |
| parent | 98c2d2aa46c2725b360907cf5537338ac6d052ed (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers')
| -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 |