You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip eb39db7f93 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml		7 years ago
..
account_serializer.rb	[WIP] Enable custom emoji on account pages and in the sidebar (#6124)	7 years ago
application_serializer.rb	In REST API, when URL can be missing, cast it to nil (#5259)	7 years ago
context_serializer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	8 years ago
credential_account_serializer.rb	Add setting a always mark media as sensitive (#4136)	8 years ago
custom_emoji_serializer.rb	Feature: Unlisted custom emojis (#5485)	7 years ago
instance_serializer.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
list_serializer.rb	Display list column (#5750)	7 years ago
media_attachment_serializer.rb	In REST API, when URL can be missing, cast it to nil (#5259)	7 years ago
mute_serializer.rb	Define a serializer for /api/v1/mutes/details	7 years ago
notification_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	7 years ago
preview_card_serializer.rb	Add embed_url to preview cards (#5775)	7 years ago
relationship_serializer.rb	Break out nested relationship API keys (#5887)	7 years ago
report_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	7 years ago
search_serializer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	8 years ago
status_serializer.rb	Do not re-query mentions from serializers (#6858)	7 years ago