diff options
author | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-21 06:31:11 +0300 |
---|---|---|
committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-21 06:31:11 +0300 |
commit | 9b24407b68bbd9a80e96ffe5795b1286272b7087 (patch) | |
tree | 998a40079d9acf09590cb361c09dd1a42110b9b5 /config | |
parent | 975afe03bbc9406de5998f91f32aae9ba58a54b4 (diff) | |
parent | 428c97d089a576e9221c6e3b1ebab76adfb3d088 (diff) |
Merge branch 'next-minor' into develop
Diffstat (limited to 'config')
-rw-r--r-- | config/application.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 7594255f8..9b1c1050b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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 |