Merge branch 'next-minor' into develop

This commit is contained in:
Benjamin Neff 2022-07-21 05:31:11 +02:00
commit 9b24407b68
No known key found for this signature in database
GPG key ID: 971464C3F1A90194

View file

@ -39,6 +39,11 @@ module Diaspora
# Enable escaping HTML in JSON.
config.active_support.escape_html_entities_in_json = true
# We specify CSRF protection manually in ApplicationController with
# protect_from_forgery - having it enabled anywhere by default breaks
# federation.
config.action_controller.default_protect_from_forgery = false
# Enable the asset pipeline
config.assets.enabled = true