Archos/masto-fe-archos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
This commit is contained in:
Claire
2023-10-08 17:21:12 +02:00
parent 74c27e33e3 c676bc91e9
commit ac2370778a
24 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/environments/production.rb
+6 -6
View File
@@ -44,7 +44,7 @@ Rails.application.configure do
config.force_ssl = true
config.ssl_options = {
redirect: {
exclude: -> request { request.path.start_with?('/health') || request.headers["Host"].end_with?('.onion') || request.headers["Host"].end_with?('.i2p') }
exclude: ->request { request.path.start_with?('/health') || request.headers["Host"].end_with?('.onion') || request.headers["Host"].end_with?('.i2p') }
}
}
@@ -148,12 +148,12 @@ Rails.application.configure do
config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym
config.action_dispatch.default_headers = {
'Server' => 'Mastodon',
'X-Frame-Options' => 'DENY',
'Server' => 'Mastodon',
'X-Frame-Options' => 'DENY',
'X-Content-Type-Options' => 'nosniff',
'X-XSS-Protection' => '0',
'X-Clacks-Overhead' => 'GNU Natalie Nguyen',
'Referrer-Policy' => 'same-origin',
'X-XSS-Protection' => '0',
'X-Clacks-Overhead' => 'GNU Natalie Nguyen',
'Referrer-Policy' => 'same-origin',
}
config.x.otp_secret = ENV.fetch('OTP_SECRET')