diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-28 09:38:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-28 09:38:44 +0100 |
| commit | 2ba6267f1603cee682bfe3885b797ad5df7e958f (patch) | |
| tree | 60586262894c6aadf5722a53ce560c9b05c3e974 /config | |
| parent | 58930199379305e718d57b48488cc752b452e72a (diff) | |
| parent | 94a39f6b68e236993fe5b89a697b17c8535f6ea0 (diff) | |
Merge pull request #1668 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/production.rb | 3 | ||||
| -rw-r--r-- | config/environments/test.rb | 3 |
2 files changed, 4 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' } diff --git a/config/environments/test.rb b/config/environments/test.rb index a35cadcfa..ef3cb2e48 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -70,3 +70,6 @@ if ENV['PAM_ENABLED'] == 'true' env: { email: 'pam@example.com' } } end + +# Catch serialization warnings early +Sidekiq.strict_args! |