aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2012-08-10 21:11:56 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2012-08-10 21:11:56 -0500
commitc347236ce9feb8e92e0543e3c51a9bcccf319a9c (patch)
tree9a4cd9adbf6603409a30f281ebdb9e89c38acab4 /railties
parenta63fc94aa3689f1e781ac51411ec79a81c011d8a (diff)
downloadrails-c347236ce9feb8e92e0543e3c51a9bcccf319a9c.tar.gz
rails-c347236ce9feb8e92e0543e3c51a9bcccf319a9c.tar.bz2
rails-c347236ce9feb8e92e0543e3c51a9bcccf319a9c.zip
Move AD default_headers configurations to railtie
ActionDispatch railtie is a better place for config.action_dispatch.default_headers settings, users can continue overriding those settings in their configuration files if needed.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/application.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index a952ff7fb0..b2b760ee7b 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -41,11 +41,6 @@ module <%= app_const_base %>
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
- config.action_dispatch.default_headers = {
- 'X-Frame-Options' => 'SAMEORIGIN',
- 'X-XSS-Protection' => '1; mode=block'
- }
-
# Use SQL instead of Active Record's schema dumper when creating the database.
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types.