Claire 63ca7222d6 Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.		2023-07-12 15:27:32 +02:00
..
activitypub	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +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-07-06 15:16:34 +02:00
web	Fix web push notifications containing HTML entities (#18071)	2022-04-23 21:47:43 +02:00
initial_state_serializer.rb	Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02: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