diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-07-17 11:52:56 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-07-17 11:52:56 -0700 |
| commit | 636e6b7138864ceb1e309939cd879e710b287f3e (patch) | |
| tree | 2a36dfef02f706302a20bb5b2d428b32e9af97f0 /railties/environments/production.rb | |
| parent | 842917dea0cfdf70f158a312cc1f77f769791d8c (diff) | |
| parent | 99930d499e424f4560b371412e05d10476216ece (diff) | |
| download | rails-636e6b7138864ceb1e309939cd879e710b287f3e.tar.gz rails-636e6b7138864ceb1e309939cd879e710b287f3e.tar.bz2 rails-636e6b7138864ceb1e309939cd879e710b287f3e.zip | |
Merge branch 'master' into i18n-merge
Conflicts:
actionpack/lib/action_view/helpers/form_options_helper.rb
activerecord/lib/active_record/validations.rb
Diffstat (limited to 'railties/environments/production.rb')
| -rw-r--r-- | railties/environments/production.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/environments/production.rb b/railties/environments/production.rb index 69c8b9ecb6..e915e8be73 100644 --- a/railties/environments/production.rb +++ b/railties/environments/production.rb @@ -10,7 +10,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 # Use a different cache store in production # config.cache_store = :mem_cache_store |