diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-24 11:54:27 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-24 11:54:27 +0200 |
| commit | 7324e46a3fe7be282deeda14783f4170ccf03a3c (patch) | |
| tree | 79968712783f47c816d81e97604f77ff7d920b40 /actionpack/lib/action_controller/abstract.rb | |
| parent | 1fee2fb996229236fb236bcef423930fdf1dfe2d (diff) | |
| parent | 6e039e863a5d71f2a516be2eef2605be23281290 (diff) | |
| download | rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.tar.gz rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.tar.bz2 rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base/mime_responds.rb
Diffstat (limited to 'actionpack/lib/action_controller/abstract.rb')
| -rw-r--r-- | actionpack/lib/action_controller/abstract.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/abstract.rb b/actionpack/lib/action_controller/abstract.rb index 48e33282ec..d6b7a44f5f 100644 --- a/actionpack/lib/action_controller/abstract.rb +++ b/actionpack/lib/action_controller/abstract.rb @@ -3,6 +3,7 @@ require "active_support/core_ext/module/delegation" module AbstractController autoload :Base, "action_controller/abstract/base" + autoload :Benchmarker, "action_controller/abstract/benchmarker" autoload :Callbacks, "action_controller/abstract/callbacks" autoload :Helpers, "action_controller/abstract/helpers" autoload :Layouts, "action_controller/abstract/layouts" |