diff options
| author | Nick Schonning <nschonni@gmail.com> | 2023-03-31 03:33:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-31 09:33:52 +0200 |
| commit | 500d6f93be0f84b7a8d338c8860936618f27dfe8 (patch) | |
| tree | 9f8f71f7ddddf39672b7c920b309a4d6dbf9d7b5 | |
| parent | 83fc97285b97ceaebb1dd878fd76883ad13dcfd0 (diff) | |
Autofix Rubocop Style/IdenticalConditionalBranches (#24322)
| -rw-r--r-- | .rubocop_todo.yml | 5 | ||||
| -rw-r--r-- | config/initializers/content_security_policy.rb | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a3832ae70..e15cb30f5 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -2218,11 +2218,6 @@ Style/HashTransformValues: - 'app/serializers/rest/web_push_subscription_serializer.rb' - 'app/services/import_service.rb' -# This cop supports unsafe autocorrection (--autocorrect-all). -Style/IdenticalConditionalBranches: - Exclude: - - 'config/initializers/content_security_policy.rb' - # This cop supports safe autocorrection (--autocorrect). Style/IfUnlessModifier: Exclude: diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index cb5629337..96026ce3b 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -27,19 +27,17 @@ Rails.application.config.content_security_policy do |p| p.frame_src :self, :https p.manifest_src :self, assets_host p.form_action :self + p.child_src :self, :blob, assets_host + p.worker_src :self, :blob, assets_host if Rails.env.development? webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{Webpacker.dev_server.host_with_port}" } p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host - p.child_src :self, :blob, assets_host - p.worker_src :self, :blob, assets_host else p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url p.script_src :self, assets_host, "'wasm-unsafe-eval'" - p.child_src :self, :blob, assets_host - p.worker_src :self, :blob, assets_host end end |