Claire 449dc30739 Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to glitch-soc's `EXTRA_DATA_HOST`. Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.		2025-03-26 19:14:26 +01:00
..
activitypub	Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream	2025-01-14 20:38:32 +01:00
node_info	nodeinfo: add instance name and description (#28079)	2023-11-28 00:51:22 +00:00
rest	Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream	2025-03-26 19:14:26 +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 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream	2025-02-01 19:07:13 +01: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	Change ActivityPub path generation to all happen in `ActivityPub::TagManager` (#33527)	2025-01-13 09:39:05 +00:00