diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 18:31:22 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 18:31:40 -0700 |
| commit | 685a53a360d0d8fc4a9f3b49f900621c940a71f2 (patch) | |
| tree | fa6b38f75a873a21c3e380f1acbab3d019293363 /railties/environments | |
| parent | db05c73fb6e2294c576ef9889c70940891682c32 (diff) | |
| parent | 164a94d0bc8c9124ab820506e5ad79496395c026 (diff) | |
| download | rails-685a53a360d0d8fc4a9f3b49f900621c940a71f2.tar.gz rails-685a53a360d0d8fc4a9f3b49f900621c940a71f2.tar.bz2 rails-685a53a360d0d8fc4a9f3b49f900621c940a71f2.zip | |
Merge branch 'master' into cherry
Conflicts:
activesupport/CHANGELOG
activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
activesupport/lib/active_support/core_ext/hash/conversions.rb
activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
activesupport/lib/active_support/core_ext/string/multibyte.rb
activesupport/lib/active_support/core_ext/time/calculations.rb
activesupport/lib/active_support/deprecation.rb
Diffstat (limited to 'railties/environments')
| -rw-r--r-- | railties/environments/production.rb | 1 | ||||
| -rw-r--r-- | railties/environments/test.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/railties/environments/production.rb b/railties/environments/production.rb index 27119d2d18..1fc9f6b923 100644 --- a/railties/environments/production.rb +++ b/railties/environments/production.rb @@ -7,7 +7,6 @@ config.cache_classes = true # Full error reports are disabled and caching is turned on config.action_controller.consider_all_requests_local = false config.action_controller.perform_caching = true -config.action_view.cache_template_loading = true # See everything in the log (default is :info) # config.log_level = :debug diff --git a/railties/environments/test.rb b/railties/environments/test.rb index d6f80a4080..496eb9572b 100644 --- a/railties/environments/test.rb +++ b/railties/environments/test.rb @@ -12,7 +12,6 @@ config.whiny_nils = true # Show full error reports and disable caching config.action_controller.consider_all_requests_local = true config.action_controller.perform_caching = false -config.action_view.cache_template_loading = true # Disable request forgery protection in test environment config.action_controller.allow_forgery_protection = false |