aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/environments/development.rb4
-rw-r--r--railties/environments/environment.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/environments/development.rb b/railties/environments/development.rb
index 568ccd0cc5..09a451f9a3 100644
--- a/railties/environments/development.rb
+++ b/railties/environments/development.rb
@@ -10,9 +10,9 @@ config.whiny_nils = true
# Show full error reports and disable caching
config.action_controller.consider_all_requests_local = true
+config.action_view.debug_rjs = true
config.action_controller.perform_caching = false
config.action_view.cache_template_extensions = false
-config.action_view.debug_rjs = true
# Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
+config.action_mailer.raise_delivery_errors = false \ No newline at end of file
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 8cbb016ac0..79306b0272 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -34,6 +34,8 @@ Rails::Initializer.run do |config|
# Your secret key for verifying cookie session data integrity.
# 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.
config.action_controller.session = {
:session_key => '_<%= app_name %>_session',
:secret => '<%= app_secret %>'