mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Change streaming API host to not be overridden to localhost in development mode (#28557)

Browse Source
This commit is contained in:
Claire 2024-01-03 11:23:58 +01:00 committed by GitHub
parent 7cce2a41f2
commit bd415af9a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/1_hosts.rb
View File

@ -23,7 +23,7 @@ Rails.application.configure do
if Rails.env.production? if Rails.env.production?
"ws#{https ? 's' : ''}://#{web_host}" "ws#{https ? 's' : ''}://#{web_host}"
else else
"ws://#{ENV['REMOTE_DEV'] == 'true' ? host.split(':').first : 'localhost'}:4000" "ws://#{host.split(':').first}:4000"
end end
end end

2
spec/requests/content_security_policy_spec.rb
View File

@ -20,7 +20,7 @@ describe 'Content-Security-Policy' do
"form-action 'self'", "form-action 'self'",
"child-src 'self' blob: https://cb6e6126.ngrok.io", "child-src 'self' blob: https://cb6e6126.ngrok.io",
"worker-src 'self' blob: https://cb6e6126.ngrok.io", "worker-src 'self' blob: https://cb6e6126.ngrok.io",
"connect-src 'self' data: blob: https://cb6e6126.ngrok.io ws://localhost:4000", "connect-src 'self' data: blob: https://cb6e6126.ngrok.io ws://cb6e6126.ngrok.io:4000",
"script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'" "script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'"
) )
end end