Merge branch 'next-minor' into develop
This commit is contained in:
commit
9b24407b68
1 changed files with 5 additions and 0 deletions
|
|
@ -39,6 +39,11 @@ module Diaspora
|
||||||
# Enable escaping HTML in JSON.
|
# Enable escaping HTML in JSON.
|
||||||
config.active_support.escape_html_entities_in_json = true
|
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
|
# Enable the asset pipeline
|
||||||
config.assets.enabled = true
|
config.assets.enabled = true
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue