diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-11-04 22:13:34 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-11-04 22:13:34 +0100 |
| commit | 7b471dbf5bdab9579962e71bcf2e24e01bcc99ef (patch) | |
| tree | f933469f29b5a1cb7681b8da1a903eb1fc4e59c3 /railties/lib/rails/generators | |
| parent | 110e49179c8ceb9d4abd6110feec1496a3eac1f0 (diff) | |
| parent | a3e05f7c819ae7a3c08240f64a76439412d144cf (diff) | |
| download | rails-7b471dbf5bdab9579962e71bcf2e24e01bcc99ef.tar.gz rails-7b471dbf5bdab9579962e71bcf2e24e01bcc99ef.tar.bz2 rails-7b471dbf5bdab9579962e71bcf2e24e01bcc99ef.zip | |
Merge pull request #22173 from kaspth/enable-public-file-server
Add enabled flag to the public file server settings.
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 0297ab75f6..a5302550fa 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -16,7 +16,7 @@ Rails.application.configure do # Disable serving static files from the `/public` folder by default since # Apache or NGINX already handles this. - config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present? + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? <%- unless options.skip_sprockets? -%> # Compress JavaScripts and CSS. 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 5165100c22..8133917591 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 @@ -12,8 +12,8 @@ Rails.application.configure do # preloads Rails for running tests, you may have to set it to true. config.eager_load = false - # Configure static file server for tests with Cache-Control for performance. - config.serve_static_files = true + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' } |