diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-11-24 11:37:57 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-11-24 11:37:57 -0600 |
| commit | 703fecb4fc81c3a975a53c9c4534f40193bd1ab9 (patch) | |
| tree | 4351e2ad2c37fcca29f31f1feb3eba98b45d3a95 /actionpack/lib | |
| parent | 368117c0411a636a0cbfdc33fbf679c3e9233da7 (diff) | |
| download | rails-703fecb4fc81c3a975a53c9c4534f40193bd1ab9.tar.gz rails-703fecb4fc81c3a975a53c9c4534f40193bd1ab9.tar.bz2 rails-703fecb4fc81c3a975a53c9c4534f40193bd1ab9.zip | |
Add LAZY env flag for testing autoload/lazy load feature
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 8b4819bf65..08e6f4efa8 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -101,4 +101,4 @@ autoload :Mime, 'action_controller/mime_type' autoload :HTML, 'action_controller/vendor/html-scanner' autoload :Rack, 'action_controller/vendor/rack' -ActionController.load_all! +ActionController.load_all! unless ENV['LAZY'] diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index 0c76204060..436bce4a69 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -56,4 +56,4 @@ end I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml" -ActionView.load_all! +ActionView.load_all! unless ENV['LAZY'] |