aboutsummaryrefslogtreecommitdiffstats
path: root/railties/configs
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-01-14 15:36:27 +0000
committerPratik Naik <pratiknaik@gmail.com>2009-01-14 15:36:27 +0000
commitdeb597d63db0c903ce0ff70ab53abed60f95192a (patch)
tree52cd072f2e666baa0286aea741c365d7cb30f42f /railties/configs
parente46c80765525817a89b784e6336a9f66250d53fc (diff)
parent9bcf01b23c25e640da7908ac8b1b49fbf7d2e51a (diff)
downloadrails-deb597d63db0c903ce0ff70ab53abed60f95192a.tar.gz
rails-deb597d63db0c903ce0ff70ab53abed60f95192a.tar.bz2
rails-deb597d63db0c903ce0ff70ab53abed60f95192a.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/configs')
-rw-r--r--railties/configs/initializers/session_store.rb2
1 files changed, 1 insertions, 1 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 %>'
}