Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `config/environments/production.rb`:
  Upstream changed a header but we had different default headers.
  Applied the same change, and also dropped HSTS headers redundant with
  Rails'.

1 files changed, 1 insertions, 2 deletions

diff --git a/config/environments/production.rb b/config/environments/production.rb
index b72d1b342..ce3c41799 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -118,10 +118,9 @@ Rails.application.configure do
     'Server'                  => 'Mastodon',
     'X-Frame-Options'         => 'DENY',
     'X-Content-Type-Options'  => 'nosniff',
-    'X-XSS-Protection'        => '1; mode=block',
+    'X-XSS-Protection'        => '0',
     'Permissions-Policy'      => 'interest-cohort=()',
     'Referrer-Policy'         => 'same-origin',
-    'Strict-Transport-Security' => 'max-age=63072000; includeSubDomains; preload',
     'X-Clacks-Overhead' => 'GNU Natalie Nguyen'
   }