mastodon/app/serializers
Thibaut Girka f627ea99e4 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
2018-10-05 15:23:57 +02:00
..
activitypub Do not check for file existence when serializing ActivityPub actor (#8386) 2018-08-23 16:39:22 +02:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
rss Add RSS feeds for end-users (#7259) 2018-04-25 02:10:02 +02:00
web Only display web push notifications after API call (fixes #7902) (#8396) 2018-08-23 21:44:27 +02:00
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
manifest_serializer.rb implement web share target (#6278) 2018-01-17 17:08:10 +01:00
oembed_serializer.rb Clean up and improve generated OpenGraph tags (#4901) 2017-09-12 05:39:38 +02:00
webfinger_serializer.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00