diff options
author | Joshua Peek <josh@joshpeek.com> | 2008-07-15 22:51:16 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-07-15 22:58:42 -0500 |
commit | 83e29b9773ac113ceacb1e36c2f333d692de2573 (patch) | |
tree | 5cc5a8d9c1c646550df1741da9f78783e22038fe /railties/lib | |
parent | 5cc3ea6969f047a782fa8ac44530baeef597edb3 (diff) | |
download | rails-83e29b9773ac113ceacb1e36c2f333d692de2573.tar.gz rails-83e29b9773ac113ceacb1e36c2f333d692de2573.tar.bz2 rails-83e29b9773ac113ceacb1e36c2f333d692de2573.zip |
Removed config.action_view.cache_template_loading, use config.cache_classes instead
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/initializer.rb | 1 | ||||
-rw-r--r-- | railties/lib/performance_test_help.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 7808d88d92..0b052e1fda 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -414,6 +414,7 @@ Run `rake gems:install` to install the missing gems. # paths have already been set, it is not changed, otherwise it is # set to use Configuration#view_path. def initialize_framework_views + ActionView::PathSet::Path.eager_load_templates! if configuration.cache_classes ActionMailer::Base.template_root ||= configuration.view_path if configuration.frameworks.include?(:action_mailer) ActionController::Base.view_paths = [configuration.view_path] if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.empty? end diff --git a/railties/lib/performance_test_help.rb b/railties/lib/performance_test_help.rb index a5e52a7acb..5148b4ab77 100644 --- a/railties/lib/performance_test_help.rb +++ b/railties/lib/performance_test_help.rb @@ -1,6 +1,5 @@ require 'action_controller/performance_test' ActionController::Base.perform_caching = true -ActionView::Base.cache_template_loading = true ActiveSupport::Dependencies.mechanism = :require Rails.logger.level = ActiveSupport::BufferedLogger::INFO |