Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-20 13:48:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-05-11 22:10:56 +02:00
parent 3286daa807 1959365c2f
commit f35ba6963d
74 changed files with 613 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/requests/content_security_policy_spec.rb
View File

@@ -23,7 +23,7 @@ describe 'Content-Security-Policy' do
<<~CSP.split("\n").map(&:strip)
base-uri 'none'
child-src 'self' blob: https://cb6e6126.ngrok.io
connect-src 'self' data: blob: https://cb6e6126.ngrok.io ws://cb6e6126.ngrok.io:4000
connect-src 'self' data: blob: https://cb6e6126.ngrok.io #{Rails.configuration.x.streaming_api_base_url}
default-src 'none'
font-src 'self' https://cb6e6126.ngrok.io
form-action 'self'