Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream ... Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.		2024-03-11 17:29:07 +01:00
..
activitypub	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00
node_info	nodeinfo: add instance name and description (#28079)	2023-11-28 00:51:22 +00:00
rest	Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream	2024-03-11 17:29:07 +01:00
web	Update dependency rubocop-rails to v2.20.1 (#25493)	2023-07-13 11:44:02 +02:00
initial_state_serializer.rb	Remove `max_toot_chars` from initial-state	2024-02-24 13:58:00 +01:00
manifest_serializer.rb	Use a helper to avoid using `media/` asset prefixes (#28756)	2024-01-17 12:19:51 +00:00
oembed_serializer.rb	…
webfinger_serializer.rb	Add avatar image to webfinger responses (#26558)	2023-08-31 13:46:27 +02:00