diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-01-08 22:19:22 +0100 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2019-01-08 22:19:22 +0100 |
commit | 647d7e61679ac4c28c081532ad0a0d7e1f80482b (patch) | |
tree | 45c2dc066c3268392e021cf71d65be9d09837d9a /railties/lib/rails | |
parent | f66a977fc7ae30d2a07124ad91924c4ee638a703 (diff) | |
download | rails-647d7e61679ac4c28c081532ad0a0d7e1f80482b.tar.gz rails-647d7e61679ac4c28c081532ad0a0d7e1f80482b.tar.bz2 rails-647d7e61679ac4c28c081532ad0a0d7e1f80482b.zip |
Revert "Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json""
I reverted the wrong commit. Damn it.
This reverts commit f66a977fc7ae30d2a07124ad91924c4ee638a703.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/content_security_policy.rb.tt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/content_security_policy.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/content_security_policy.rb.tt index d3bcaa5ec8..c517b0f96b 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/content_security_policy.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/content_security_policy.rb.tt @@ -11,6 +11,10 @@ # policy.object_src :none # policy.script_src :self, :https # policy.style_src :self, :https +<%- unless options[:skip_javascript] -%> +# # If you are using webpack-dev-server then specify webpack-dev-server host +# policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development? +<%- end -%> # # Specify URI for violation reports # # policy.report_uri "/csp-violation-report-endpoint" |