aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-04 12:12:04 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-04 12:12:04 -0800
commit9795bf0e74612aa542404460220720c14fac1038 (patch)
tree1453fe51b6003ed28e9d459609e4b94f54674992 /railties/lib
parent17769696279810c6c24a10b0d47f9b712205f0ce (diff)
downloadrails-9795bf0e74612aa542404460220720c14fac1038.tar.gz
rails-9795bf0e74612aa542404460220720c14fac1038.tar.bz2
rails-9795bf0e74612aa542404460220720c14fac1038.zip
Fix Sam Ruby's tests and deprecation warnings
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt b/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt
index baff704d3e..2f04ed8fb0 100644
--- a/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt
+++ b/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt
@@ -4,7 +4,7 @@
# If you change this key, all old sessions will become invalid!
# 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 = {
+Rails.application.config.action_dispatch.session = {
:key => '_<%= app_name %>_session',
:secret => '<%= app_secret %>'
}
@@ -12,4 +12,4 @@ ActionController::Base.session = {
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
# (create the session table with "rake db:sessions:create")
-# ActionController::Base.session_store = :active_record_store
+# Rails.application.config.action_dispatch.session_store = :active_record_store