Claire 7d52d5df0f Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Conflict due to upstream adding fallback support for MathML Core while glitch-soc supported slightly more tags than upstream. Added the MathML Core fallback code to glitch-soc. - `spec/lib/sanitize/config_spec.rb`: Ditto.		2024-12-01 18:22:00 +01:00
..
activitypub	Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream	2024-09-23 20:24:18 +02:00
node_info	nodeinfo: add instance name and description (#28079)	2023-11-28 00:51:22 +00:00
rest	Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream	2024-12-01 18:22:00 +01: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 '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream	2024-09-17 17:54:00 +02:00
manifest_serializer.rb	Prefer native apps over PWA (#27254)	2024-10-07 20:33:14 +00:00
oauth_metadata_serializer.rb	Add userinfo oauth endpoint (#32548)	2024-10-30 14:38:10 +00:00
oauth_userinfo_serializer.rb	Add userinfo oauth endpoint (#32548)	2024-10-30 14:38:10 +00:00
oembed_serializer.rb	Use heredoc/squish for inline css styles in oembed serializer (#31991)	2024-09-20 12:50:51 +00:00
webfinger_serializer.rb	Add avatar image to webfinger responses (#26558)	2023-08-31 13:46:27 +02:00