mirror of https://github.com/Siphonay/mastodon
Fix autoloading deprecation warnings from Rails 6 (#16010)
This commit is contained in:
parent
ed7d459d7f
commit
3f2533ca8e
|
@ -51,11 +51,13 @@ Rails.application.config.content_security_policy_nonce_generator = -> request {
|
||||||
|
|
||||||
Rails.application.config.content_security_policy_nonce_directives = %w(style-src)
|
Rails.application.config.content_security_policy_nonce_directives = %w(style-src)
|
||||||
|
|
||||||
PgHero::HomeController.content_security_policy do |p|
|
Rails.application.reloader.to_prepare do
|
||||||
|
PgHero::HomeController.content_security_policy do |p|
|
||||||
p.script_src :self, :unsafe_inline, assets_host
|
p.script_src :self, :unsafe_inline, assets_host
|
||||||
p.style_src :self, :unsafe_inline, assets_host
|
p.style_src :self, :unsafe_inline, assets_host
|
||||||
end
|
end
|
||||||
|
|
||||||
PgHero::HomeController.after_action do
|
PgHero::HomeController.after_action do
|
||||||
request.content_security_policy_nonce_generator = nil
|
request.content_security_policy_nonce_generator = nil
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -112,7 +112,9 @@ else
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
Paperclip.options[:content_type_mappings] = { csv: Import::FILE_TYPES }
|
Rails.application.reloader.to_prepare do
|
||||||
|
Paperclip.options[:content_type_mappings] = { csv: Import::FILE_TYPES }
|
||||||
|
end
|
||||||
|
|
||||||
# In some places in the code, we rescue this exception, but we don't always
|
# In some places in the code, we rescue this exception, but we don't always
|
||||||
# load the S3 library, so it may be an undefined constant:
|
# load the S3 library, so it may be an undefined constant:
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
ActionController::Base.log_warning_on_csrf_failure = false
|
Rails.application.reloader.to_prepare do
|
||||||
|
ActionController::Base.log_warning_on_csrf_failure = false
|
||||||
|
end
|
||||||
|
|
Loading…
Reference in New Issue