aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-24 12:13:09 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-24 12:13:09 -0500
commit9f96708f53b4eee8830554dd8f0a482160ef4c73 (patch)
treec2899c3716b0ae6715cd617d1d6b443f84da205b /actionpack/lib/action_controller/base.rb
parentc2f8b4e92f8487b83a7c7bd0f19e535a9122d20e (diff)
downloadrails-9f96708f53b4eee8830554dd8f0a482160ef4c73.tar.gz
rails-9f96708f53b4eee8830554dd8f0a482160ef4c73.tar.bz2
rails-9f96708f53b4eee8830554dd8f0a482160ef4c73.zip
Resurrect AC::Benchmarking [#3140 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rw-r--r--actionpack/lib/action_controller/base.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index f5bd0a00a1..5338a70104 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -14,6 +14,7 @@ module ActionController
include ActionController::Layouts
include ActionController::ConditionalGet
include ActionController::RackConvenience
+ include ActionController::Benchmarking
# Legacy modules
include SessionManagement