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

Add categories for custom emojis (#11196)

Browse Source 
Fix #7940
This commit is contained in:
Eugen Rochko authored and GitHub committed 2019-06-28 15:54:10 +02:00
1 parent 072158ee97
commit e64e6a03dd
13 files changed
+86 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/api/v1/custom_emojis_controller.rb
+1 -1
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