aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller.rb
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-09-21 12:05:28 -0700
committerYehuda Katz <wycats@gmail.com>2009-09-21 12:05:28 -0700
commit1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50 (patch)
tree36201d3efb5af8ae5ec1898fd6f3b8b366227819 /actionpack/lib/abstract_controller.rb
parente2d0b0ee61c5a8c2626abb5ac1029b48ec1965eb (diff)
parent4215e9ab936efca915ca998273d2fc0c46bb59b8 (diff)
downloadrails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.tar.gz
rails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.tar.bz2
rails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.zip
Merge commit 'jose/orchestra'
Diffstat (limited to 'actionpack/lib/abstract_controller.rb')
-rw-r--r--actionpack/lib/abstract_controller.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index cdeb55b915..76c5845f5b 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -3,7 +3,6 @@ require "active_support/core_ext/module/delegation"
module AbstractController
autoload :Base, "abstract_controller/base"
- autoload :Benchmarker, "abstract_controller/benchmarker"
autoload :Callbacks, "abstract_controller/callbacks"
autoload :Helpers, "abstract_controller/helpers"
autoload :Layouts, "abstract_controller/layouts"