aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-08-14 16:00:52 -0400
committerGitHub <noreply@github.com>2017-08-14 16:00:52 -0400
commita684d7b4a0714e498ba08cbdfaeea7ee35587aa7 (patch)
tree236c06856a8c78688b5cf70ea6045b7370a24343 /railties/lib/rails
parentf9f577233642ae92fcbde5531afa3dbd75cb08c2 (diff)
parent77e8b9b5864a3c6f2c4390914582ca10c161bc30 (diff)
downloadrails-a684d7b4a0714e498ba08cbdfaeea7ee35587aa7.tar.gz
rails-a684d7b4a0714e498ba08cbdfaeea7ee35587aa7.tar.bz2
rails-a684d7b4a0714e498ba08cbdfaeea7ee35587aa7.zip
Merge pull request #30244 from yhirano55/refactor_max_age_seconds
Refactor max-age seconds
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt2
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
index d69769f631..98689cc30d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
@@ -19,7 +19,7 @@ Rails.application.configure do
config.cache_store = :memory_store
config.public_file_server.headers = {
- 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
+ 'Cache-Control' => "public, max-age=#{2.days.to_i}"
}
else
config.action_controller.perform_caching = false
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 fdf16b4730..a53978bc6e 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
@@ -15,7 +15,7 @@ Rails.application.configure do
# 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=#{1.hour.seconds.to_i}"
+ 'Cache-Control' => "public, max-age=#{1.hour.to_i}"
}
# Show full error reports and disable caching.