diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2015-10-13 11:16:50 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2015-10-13 11:16:50 -0700 |
| commit | 9d05430c956c4ae1d0aefda02def5052ea818433 (patch) | |
| tree | ce122ef6f33520e5e00e808927490464cc0f6f87 /railties/lib/rails/generators/rails | |
| parent | 8e7a3b056328c55e0c2a9cb51e46db443ebe8569 (diff) | |
| parent | 52260581638406d910e09e8d2e66b51acb76c5c6 (diff) | |
| download | rails-9d05430c956c4ae1d0aefda02def5052ea818433.tar.gz rails-9d05430c956c4ae1d0aefda02def5052ea818433.tar.bz2 rails-9d05430c956c4ae1d0aefda02def5052ea818433.zip | |
Merge pull request #19135 from yuki24/access-control-support
Add basic support for access control headers to ActionDispatch::Static
Diffstat (limited to 'railties/lib/rails/generators/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt index 0306deb18c..5165100c22 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt @@ -13,8 +13,10 @@ Rails.application.configure do config.eager_load = false # Configure static file server for tests with Cache-Control for performance. - config.serve_static_files = true - config.static_cache_control = 'public, max-age=3600' + config.serve_static_files = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } # Show full error reports and disable caching. config.consider_all_requests_local = true |