aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-24 18:43:04 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-24 18:43:04 -0800
commit104f3a57768602289299b3be0fab5b1ed21d7653 (patch)
tree8e467393ec0541d3db1cacd895e094e995574eb4 /actionpack/lib
parentd01f75b1f091c37d14ece70cbe5f52f20f25d64c (diff)
downloadrails-104f3a57768602289299b3be0fab5b1ed21d7653.tar.gz
rails-104f3a57768602289299b3be0fab5b1ed21d7653.tar.bz2
rails-104f3a57768602289299b3be0fab5b1ed21d7653.zip
Add config.preload_frameworks to load all frameworks at startup. Default to false so Rails autoloads itself as it's used.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller.rb2
-rw-r--r--actionpack/lib/action_view.rb2
2 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 08e6f4efa8..62d75a47ec 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -100,5 +100,3 @@ autoload :Mime, 'action_controller/mime_type'
autoload :HTML, 'action_controller/vendor/html-scanner'
autoload :Rack, 'action_controller/vendor/rack'
-
-ActionController.load_all! unless ENV['LAZY']
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 436bce4a69..210a5f1a93 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -55,5 +55,3 @@ class ERB
end
I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
-
-ActionView.load_all! unless ENV['LAZY']