aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/configs/initializers/session_store.rb2
-rw-r--r--railties/doc/guides/source/security.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/configs/initializers/session_store.rb b/railties/configs/initializers/session_store.rb
index 40179e0aa3..4499ab84b6 100644
--- a/railties/configs/initializers/session_store.rb
+++ b/railties/configs/initializers/session_store.rb
@@ -5,7 +5,7 @@
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
ActionController::Base.session = {
- :session_key => '_<%= app_name %>_session',
+ :key => '_<%= app_name %>_session',
:secret => '<%= app_secret %>'
}
diff --git a/railties/doc/guides/source/security.txt b/railties/doc/guides/source/security.txt
index 9b3f47932e..b4e8bb4b41 100644
--- a/railties/doc/guides/source/security.txt
+++ b/railties/doc/guides/source/security.txt
@@ -93,7 +93,7 @@ That means the security of this storage depends on this secret (and of the diges
....................................
config.action_controller.session = {
- :session_key => ‘_app_session’,
+ :key => ‘_app_session’,
:secret => ‘0x0dkfj3927dkc7djdh36rkckdfzsg...’
}
....................................