David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06:00
..
account_serializer.rb	Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)	2017-12-14 21:35:30 +01:00
application_serializer.rb	In REST API, when URL can be missing, cast it to nil (#5259)	2017-10-07 18:55:48 +02:00
context_serializer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
credential_account_serializer.rb	Add setting a always mark media as sensitive (#4136)	2017-07-10 14:00:32 +02:00
custom_emoji_serializer.rb	Feature: Unlisted custom emojis (#5485)	2017-10-27 16:11:30 +02:00
instance_serializer.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
list_serializer.rb	Display list column (#5750)	2017-11-25 00:35:37 +01:00
media_attachment_serializer.rb	In REST API, when URL can be missing, cast it to nil (#5259)	2017-10-07 18:55:48 +02:00
mute_serializer.rb	Define a serializer for /api/v1/mutes/details	2017-09-13 21:47:30 -05:00
notification_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	2017-09-20 14:53:48 +02:00
preview_card_serializer.rb	Add embed_url to preview cards (#5775)	2017-12-07 03:37:43 +01:00
relationship_serializer.rb	Break out nested relationship API keys (#5887)	2017-12-06 16:10:54 +01:00
report_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	2017-09-20 14:53:48 +02:00
search_serializer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
status_serializer.rb	Make sure nil IDs to not get cast to empty string in REST API (#5068)	2017-09-24 04:09:32 +02:00