mastodon/app/serializers
Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
2023-01-05 14:16:25 +01:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
nodeinfo Fix nodeinfo metadata attribute being an array instead of an object (#20114) 2022-11-08 17:26:11 +01:00
rest Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
web Fix web push notifications containing HTML entities (#18071) 2022-04-23 21:47:43 +02:00
initial_state_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
manifest_serializer.rb Add maskable icon support for Android (#20904) 2022-11-17 10:52:30 +01:00
oembed_serializer.rb Improve RSS entries for statuses (#13592) 2020-05-10 09:50:54 +02:00
webfinger_serializer.rb Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +02:00