diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-28 22:35:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-28 22:35:54 +0200 |
| commit | 98c2d2aa46c2725b360907cf5537338ac6d052ed (patch) | |
| tree | 4b3301453fc3f8bcfe412a5e1bb967ec5c3414c6 /app/controllers/api | |
| parent | f7c0e326ab11a597b17a22dd8889f0690d7ffd73 (diff) | |
| parent | 662252c8f77e8dd8fd015bc6ece0943f068b1710 (diff) | |
Merge pull request #1146 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |