tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2019-06-28 21:36:50 +02:00
parent f7c0e326ab 4f5b221be2
commit 3922b518f7
15 changed files with 92 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/custom_emojis_controller.rb
View File

@@ -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