diff options
| author | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-11-30 08:43:37 -0800 |
|---|---|---|
| committer | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-11-30 08:43:37 -0800 |
| commit | 241b5f1cebb17449f31e4170671ef70866605f8b (patch) | |
| tree | e939f4aa85f321fd40090d5b5a31ecd25907135d /railties/lib/rails/application/default_middleware_stack.rb | |
| parent | 3429ab14a6f2380f4bd924fe9d9ad2eb967ae62b (diff) | |
| parent | f7e3c686685fb89e67293440d24356f93fa34847 (diff) | |
| download | rails-241b5f1cebb17449f31e4170671ef70866605f8b.tar.gz rails-241b5f1cebb17449f31e4170671ef70866605f8b.tar.bz2 rails-241b5f1cebb17449f31e4170671ef70866605f8b.zip | |
Merge branch 'master' into activestorage-guide
Diffstat (limited to 'railties/lib/rails/application/default_middleware_stack.rb')
| -rw-r--r-- | railties/lib/rails/application/default_middleware_stack.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/application/default_middleware_stack.rb b/railties/lib/rails/application/default_middleware_stack.rb index ea2273c1f2..0e79ba7da0 100644 --- a/railties/lib/rails/application/default_middleware_stack.rb +++ b/railties/lib/rails/application/default_middleware_stack.rb @@ -63,6 +63,10 @@ module Rails middleware.use ::ActionDispatch::Flash end + unless config.api_only + middleware.use ::ActionDispatch::ContentSecurityPolicy::Middleware + end + middleware.use ::Rack::Head middleware.use ::Rack::ConditionalGet middleware.use ::Rack::ETag, "no-cache" |