Claire 016d194274 Merge commit '2fe1b8d169' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests.		2024-05-06 17:53:51 +02:00
..
activitypub	Merge commit '272592d16d' 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 '7201f99cf8' into glitch-soc/merge-upstream	2024-05-04 15:24:22 +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 '6c381f20b1' into glitch-soc/merge-upstream	2024-04-06 21:01:40 +02:00
manifest_serializer.rb	Allow admins to configure instance favicon and logo (#30040)	2024-05-06 15:06:52 +00:00
oauth_metadata_serializer.rb	Implement RFC 8414 for OAuth 2.0 server metadata (#29191)	2024-05-06 13:17:56 +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