aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-09-30 09:40:06 +0900
committerGitHub <noreply@github.com>2017-09-30 09:40:06 +0900
commitdabc57050fe30e9589823ffb606323a50ee9f6d4 (patch)
treefed6ebc6e7500553dd329c9e381b1dae7b40440c
parentc97a5ad56892c5a19848b9e3803da1d16c131d86 (diff)
parent5d149048ffa56c8fa1c41d1ef3bcf9472052f369 (diff)
downloadrails-dabc57050fe30e9589823ffb606323a50ee9f6d4.tar.gz
rails-dabc57050fe30e9589823ffb606323a50ee9f6d4.tar.bz2
rails-dabc57050fe30e9589823ffb606323a50ee9f6d4.zip
Merge pull request #30756 from y-yagi/dont_use_active_support_where_it_is_not_needed
Don't use Active Support where it is not needed.
-rw-r--r--actionpack/lib/action_dispatch/middleware/ssl.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/ssl.rb b/actionpack/lib/action_dispatch/middleware/ssl.rb
index 9e1684f689..ef633aadc6 100644
--- a/actionpack/lib/action_dispatch/middleware/ssl.rb
+++ b/actionpack/lib/action_dispatch/middleware/ssl.rb
@@ -49,7 +49,7 @@ module ActionDispatch
# Default to 180 days, the low end for https://www.ssllabs.com/ssltest/
# and greater than the 18-week requirement for browser preload lists.
- HSTS_EXPIRES_IN = 180.days.to_i
+ HSTS_EXPIRES_IN = 15552000
def self.default_hsts_options
{ expires: HSTS_EXPIRES_IN, subdomains: true, preload: false }