diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2018-02-19 14:55:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 14:55:05 +0000 |
| commit | dc6185b462dc423e9e6fa89a64aa54427ff7660d (patch) | |
| tree | 3c61ade55071b719d49421cb3af825795f8900c9 /railties/lib | |
| parent | 0d41a76d0c693000005d79456dee7f9299f5e8d4 (diff) | |
| parent | d85283cc42b1a965944047a2f602153804126f77 (diff) | |
| download | rails-dc6185b462dc423e9e6fa89a64aa54427ff7660d.tar.gz rails-dc6185b462dc423e9e6fa89a64aa54427ff7660d.tar.bz2 rails-dc6185b462dc423e9e6fa89a64aa54427ff7660d.zip | |
Merge pull request #32054 from rails/fix-generation-of-empty-csp
Fix generation of empty content security policy
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 46ad3557e3..1f765f302c 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -241,7 +241,11 @@ module Rails end def content_security_policy(&block) - @content_security_policy ||= ActionDispatch::ContentSecurityPolicy.new(&block) + if block_given? + @content_security_policy = ActionDispatch::ContentSecurityPolicy.new(&block) + else + @content_security_policy + end end class Custom #:nodoc: |