gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into kb_development

Browse source
This commit is contained in:
KMY 2023-09-27 21:33:12 +09:00
commit 78ddcb10c3
67 changed files with 615 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/serializers/rest/custom_emoji_serializer.rb
View file

@ -3,6 +3,8 @@
class REST::CustomEmojiSerializer < REST::CustomEmojiSlimSerializer
include RoutingHelper
# Please update `app/javascript/mastodon/api_types/custom_emoji.ts` when making changes to the attributes
attribute :aliases, if: :aliases?
def aliases?