mastodon/app/serializers/rest
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
2018-05-03 17:23:44 -05:00
..
account_serializer.rb Add bio fields (#6645) 2018-04-14 12:41:08 +02:00
application_serializer.rb
context_serializer.rb
credential_account_serializer.rb Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288) 2018-05-02 15:57:37 +02:00
custom_emoji_serializer.rb
instance_serializer.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 00:17:17 +00:00
list_serializer.rb Display list column (#5750) 2017-11-25 00:35:37 +01:00
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
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
search_serializer.rb
status_serializer.rb Add backend support for bookmarks 2018-04-11 20:40:29 +02:00