diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-09-21 12:05:28 -0700 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-09-21 12:05:28 -0700 |
| commit | 1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50 (patch) | |
| tree | 36201d3efb5af8ae5ec1898fd6f3b8b366227819 /actionpack/lib/action_controller/base.rb | |
| parent | e2d0b0ee61c5a8c2626abb5ac1029b48ec1965eb (diff) | |
| parent | 4215e9ab936efca915ca998273d2fc0c46bb59b8 (diff) | |
| download | rails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.tar.gz rails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.tar.bz2 rails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.zip | |
Merge commit 'jose/orchestra'
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 0dae68c7b7..f5bd0a00a1 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -2,7 +2,6 @@ module ActionController class Base < Metal abstract! - include AbstractController::Benchmarker include AbstractController::Callbacks include AbstractController::Logger |