Claire 297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream modified it while we quote upstream's within an otherwise different file. Applied upstream's changes.		2025-01-18 12:42:17 +01:00
..
activitypub	Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream	2025-01-14 20:38:32 +01:00
admin	Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream	2025-01-06 20:36:25 +01:00
api	Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream	2025-01-18 12:42:17 +01:00
auth	Convert `auth/setup` spec controller->system/request (#33604)	2025-01-16 09:03:46 +00:00
concerns	Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream	2025-01-06 20:36:25 +01:00
disputes	…
filters	…
oauth	Fix logic in "last used at per application" oauth token list (#32912)	2024-11-15 15:52:37 +00:00
redirect	…
settings	Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream	2025-01-18 12:42:17 +01:00
well_known	Support /.well-known/host-meta.json (#32206)	2024-10-02 09:23:44 +00:00
about_controller.rb	…
accounts_controller.rb	…
application_controller.rb	Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream	2024-12-25 18:01:37 +01:00
authorize_interactions_controller.rb	…
backups_controller.rb	…
custom_css_controller.rb	Extend custom CSS cache time with digest paths (#33207)	2025-01-08 08:48:45 +00:00
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream	2025-01-14 20:38:32 +01:00
following_accounts_controller.rb	…
health_controller.rb	…
home_controller.rb	…
instance_actors_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
mail_subscriptions_controller.rb	…
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	Add `OpenSSL::SSL::SSLError` to http connection errors wrapper (#32307)	2024-10-08 14:59:51 +00:00
privacy_controller.rb	…
relationships_controller.rb	…
remote_interaction_helper_controller.rb	…
severed_relationships_controller.rb	…
shares_controller.rb	…
statuses_cleanup_controller.rb	…
statuses_controller.rb	…
tags_controller.rb	…
terms_of_service_controller.rb	Add terms of service (#33055)	2024-12-09 10:04:46 +00:00