aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-02-23 00:09:22 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-02-23 00:09:22 +0000
commitb50a05cac32f7e1f70ea622e2c82972c87391dfa (patch)
tree0ced4ecf540a39072e7a885ce313ad742cbe8399 /railties
parentf9a4774e0e5c34c31cd2fb726dd0f9b6694b4b1b (diff)
downloadrails-b50a05cac32f7e1f70ea622e2c82972c87391dfa.tar.gz
rails-b50a05cac32f7e1f70ea622e2c82972c87391dfa.tar.bz2
rails-b50a05cac32f7e1f70ea622e2c82972c87391dfa.zip
Move session settings closer together
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6211 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/environments/environment.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 097bb803d1..6ffacd4023 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -26,6 +26,13 @@ Rails::Initializer.run do |config|
# (by default production uses :info, the others :debug)
# config.log_level = :debug
+ # Your secret key for verifying cookie session data integrity.
+ # If you change this key, all old sessions will become invalid!
+ config.action_controller.session = {
+ :session_key => '_<%= app_name %>_session',
+ :secret => '<%= CGI::Session.generate_unique_id(app_name) %>'
+ }
+
# Use the database for sessions instead of the file system
# (create the session table with 'rake db:sessions:create')
# config.action_controller.session_store = :active_record_store
@@ -41,13 +48,6 @@ Rails::Initializer.run do |config|
# Make Active Record use UTC-base instead of local time
# config.active_record.default_timezone = :utc
- # Your secret key for verifying cookie session data integrity.
- # If you change this key, all old sessions will become invalid!
- config.action_controller.session = {
- :session_key => '_<%= app_name %>_session',
- :secret => '<%= CGI::Session.generate_unique_id(app_name) %>'
- }
-
# See Rails::Configuration for more options
end