diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-01-22 15:13:47 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-01-22 15:13:47 -0600 |
| commit | cc0b5fa9930dcc60914e21b518b3c54109243cfa (patch) | |
| tree | 3b5c65d8d0329388730542093314028630b0945a /railties/configs/initializers | |
| parent | e57cb2629ac4971a5dcb1cf8bb2f6d0509317928 (diff) | |
| parent | ccda96093a3bf3fb360f7c6d61bbbf341b2ae034 (diff) | |
| download | rails-cc0b5fa9930dcc60914e21b518b3c54109243cfa.tar.gz rails-cc0b5fa9930dcc60914e21b518b3c54109243cfa.tar.bz2 rails-cc0b5fa9930dcc60914e21b518b3c54109243cfa.zip | |
Merge branch 'master' into 3-0-unstable
Conflicts:
ci/cruise_config.rb
Diffstat (limited to 'railties/configs/initializers')
| -rw-r--r-- | railties/configs/initializers/session_store.rb | 2 |
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 %>' } |