Suppress deprecation warning: disable csp in report-only mode

This commit is contained in:
Benjamin Neff 2016-10-28 23:57:36 +02:00 committed by Dennis Schubert
parent be3b50295c
commit e18627f542
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
2 changed files with 2 additions and 0 deletions

View file

@ -38,6 +38,7 @@ Note: Although this is a minor release, the configuration file changed because t
* Display error message when aspect membership changes fail [#7132](https://github.com/diaspora/diaspora/pull/7132) * Display error message when aspect membership changes fail [#7132](https://github.com/diaspora/diaspora/pull/7132)
* Avoid the creation of pod that are none [#7145](https://github.com/diaspora/diaspora/pull/7145) * Avoid the creation of pod that are none [#7145](https://github.com/diaspora/diaspora/pull/7145)
* Fixed tag pages with alternate default aspect settings [#7262](https://github.com/diaspora/diaspora/pull/7162) * Fixed tag pages with alternate default aspect settings [#7262](https://github.com/diaspora/diaspora/pull/7162)
* Suppressed CSP related deprecation warnings [#7263](https://github.com/diaspora/diaspora/pull/7163)
## Features ## Features
* Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045) * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)

View file

@ -43,6 +43,7 @@ SecureHeaders::Configuration.default do |config|
csp[:report_uri] = [AppConfig.settings.csp.report_uri] if AppConfig.settings.csp.report_uri.present? csp[:report_uri] = [AppConfig.settings.csp.report_uri] if AppConfig.settings.csp.report_uri.present?
if AppConfig.settings.csp.report_only? if AppConfig.settings.csp.report_only?
config.csp = SecureHeaders::OPT_OUT
config.csp_report_only = csp config.csp_report_only = csp
else else
config.csp = csp config.csp = csp