mastodon/app/serializers
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
nodeinfo Add `openRegistrations` attribute to nodeinfo endpoint () 2019-10-02 21:02:48 +02:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
rss Split AccountsHelper from StatusesHelper () 2019-10-24 22:50:09 +02:00
web Only display web push notifications after API call (fixes ) () 2018-08-23 21:44:27 +02:00
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
manifest_serializer.rb Add method and enctype to manifest () 2019-09-05 15:51:51 +02:00
oembed_serializer.rb Add allowfullscreen attribute to oembed iframe () 2019-03-25 15:01:09 +01:00
webfinger_serializer.rb Remove XML version of Webfinger and remove links to Atom feeds () 2019-08-01 19:14:02 +02:00