Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add categories for custom emojis (#11196)

Browse source 
Fix #7940
This commit is contained in:
Eugen Rochko 2019-06-28 15:54:10 +02:00 • committed by GitHub
parent 072158ee97
commit e64e6a03dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 86 additions and 18 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