tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `app/lib/content_security_policy.rb`:
  Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
  glitch-soc's `EXTRA_DATA_HOST`.
  Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
This commit is contained in:
Claire
2025-03-26 19:14:26 +01:00
parent 21c05f838d c43508b3e0
commit 449dc30739
13 changed files with 196 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.production.sample
+3
View File
@@ -309,6 +309,9 @@ MAX_POLL_OPTION_CHARS=100
# HCAPTCHA_SECRET_KEY=
# HCAPTCHA_SITE_KEY=
# Optional list of hosts that are allowed to serve media for your instance
# EXTRA_MEDIA_HOSTS=https://data.example1.com,https://data.example2.com
# IP and session retention
# -----------------------
# Make sure to modify the scheduling of ip_cleanup_scheduler in config/sidekiq.yml