Claire 0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Upstream added a test for a new attribute, next to a line we modified in glitch-soc because of a different default value. Updated as upstream's did, keeping glitch-soc's default value.		2024-08-21 18:44:21 +02:00
..
activitypub	Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream	2024-06-22 20:59:23 +02:00
node_info	nodeinfo: add instance name and description (#28079)	2023-11-28 00:51:22 +00:00
rest	Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream	2024-08-21 18:44:21 +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 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream	2024-07-12 13:41:54 +02:00
manifest_serializer.rb	Fix repetitive database queries from #30040 (#30259)	2024-05-15 09:38:16 +00:00
oauth_metadata_serializer.rb	Enable OAuth PKCE Extension (#31129)	2024-07-26 08:53:10 +00:00
oembed_serializer.rb	Improve RSS entries for statuses (#13592)	2020-05-10 09:50:54 +02:00
webfinger_serializer.rb	Add avatar image to webfinger responses (#26558)	2023-08-31 13:46:27 +02:00