aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-12-18 19:54:22 +0100
committerGitHub <noreply@github.com>2017-12-18 19:54:22 +0100
commit1d047235b0cefcb80d4e18fed732cbe2bd32a8ee (patch)
tree3eed2cc82fe43fe274f98b07c057416e70c2ffcc /railties
parenta6eb2a27c3e73019bf1fa1b11794ebe55c7eaa96 (diff)
parent391ec4e39279e8f653abbab558679f40094b2e55 (diff)
downloadrails-1d047235b0cefcb80d4e18fed732cbe2bd32a8ee.tar.gz
rails-1d047235b0cefcb80d4e18fed732cbe2bd32a8ee.tar.bz2
rails-1d047235b0cefcb80d4e18fed732cbe2bd32a8ee.zip
Merge pull request #31497 from aried3r/patch-2
Update new_framework_defaults_5_2.rb.tt
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt
index f630d9985a..8351d849ec 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt
@@ -10,7 +10,7 @@
# This is needed for recyclable cache keys.
# Rails.application.config.active_record.cache_versioning = true
-# Use AES 256 GCM authenticated encryption for encrypted cookies.
+# Use AES-256-GCM authenticated encryption for encrypted cookies.
# Existing cookies will be converted on read then written with the new scheme.
# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true