Claire 6ab5b9c790 Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: We had modified the file to disable the custom ARM64 builder. Upstream has removed it, using github's runners. Took upstream's changes. - `.github/workflows/build-push-pr.yml`: We had modified the file to disable the custom ARM64 builder. Upstream has removed it, using github's runners. Took upstream's changes. - `.github/workflows/build-releases.yml`: We had modified the file to disable the custom ARM64 builder. Upstream has removed it, using github's runners. Took upstream's changes. - `.github/workflows/build-security.yml`: We had modified the file to disable the custom ARM64 builder. Upstream has removed it, using github's runners. Took upstream's changes.		2025-02-05 18:21:36 +01:00
..
activitypub	Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream	2025-01-14 20:38:32 +01:00
admin	Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream	2025-02-05 18:21:36 +01:00
api	Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream	2025-01-23 13:38:23 +01:00
auth	Remove duplicate cache header setting before action (#33833)	2025-02-05 09:19:08 +00:00
concerns	Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream	2025-01-28 18:29:46 +01:00
disputes	Remove duplicate cache header setting before action (#33833)	2025-02-05 09:19:08 +00:00
filters	Remove duplicate cache header setting before action (#33833)	2025-02-05 09:19:08 +00:00
oauth	Remove duplicate cache header setting before action (#33833)	2025-02-05 09:19:08 +00:00
redirect	Move redirect/base body class to view (#31796)	2024-09-12 13:31:50 +00:00
settings	Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream	2025-02-05 18:21:36 +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	Remove duplicate cache header setting before action (#33833)	2025-02-05 09:19:08 +00:00
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	Remove duplicate cache header setting before action (#33833)	2025-02-05 09:19:08 +00:00
mail_subscriptions_controller.rb	Fix contrast between background and form elements on some pages (#31266)	2024-08-02 13:55:31 +00:00
manifests_controller.rb	…
media_controller.rb	Add coverage for `media#player`, move body class to view (#31790)	2024-09-06 16:46:25 +00:00
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	Remove duplicate cache header setting before action (#33833)	2025-02-05 09:19:08 +00:00
remote_interaction_helper_controller.rb	…
severed_relationships_controller.rb	Remove duplicate cache header setting before action (#33833)	2025-02-05 09:19:08 +00:00
shares_controller.rb	Move shares/modal body class to layout (#31789)	2024-09-06 16:46:55 +00:00
statuses_cleanup_controller.rb	Remove duplicate cache header setting before action (#33833)	2025-02-05 09:19:08 +00:00
statuses_controller.rb	Remove unused `statuses#embed` body class assignment (#31787)	2024-09-12 13:38:15 +00:00
tags_controller.rb	…
terms_of_service_controller.rb	Add terms of service (#33055)	2024-12-09 10:04:46 +00:00