Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.		2023-07-30 14:58:56 +02:00
..
activitypub	Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream	2023-07-30 13:49:35 +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 commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream	2023-07-30 14:58:56 +02:00
web	Update dependency rubocop-rails to v2.20.1 (#25493)	2023-07-13 11:44:02 +02:00
initial_state_serializer.rb	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream	2023-07-30 14:58:56 +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