mastodon/app/serializers
Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +02:00
..
activitypub Revert "Remove conversation URI (#11423)" (#11424) 2019-07-28 17:47:37 +02:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
rss Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 2019-07-07 16:16:51 +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 2019-08-07 13:56:48 +02:00
manifest_serializer.rb Improve config serializer for Keybase (#10338) 2019-03-21 23:33:28 +01:00
oembed_serializer.rb Add allowfullscreen attribute to oembed iframe (#10370) 2019-03-25 15:01:09 +01:00
webfinger_serializer.rb Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +02:00