diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-06-01 09:38:09 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-06-01 09:38:09 +0100 |
| commit | 9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78 (patch) | |
| tree | 5a711cacac76a83ad12551023da8524f94e7365b /actionpack/lib/action_controller/abstract/benchmarker.rb | |
| parent | dc7323efd34327c13d26031b68e51314c24360f6 (diff) | |
| parent | 9537fd0e3a7625afe4bee75d749647ca1837195a (diff) | |
| download | rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.tar.gz rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.tar.bz2 rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/abstract/benchmarker.rb')
| -rw-r--r-- | actionpack/lib/action_controller/abstract/benchmarker.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/abstract/benchmarker.rb b/actionpack/lib/action_controller/abstract/benchmarker.rb index 9f5889c704..07294cede3 100644 --- a/actionpack/lib/action_controller/abstract/benchmarker.rb +++ b/actionpack/lib/action_controller/abstract/benchmarker.rb @@ -1,9 +1,9 @@ module AbstractController module Benchmarker - extend ActiveSupport::DependencyModule - - depends_on Logger - + extend ActiveSupport::Concern + + include Logger + module ClassMethods def benchmark(title, log_level = ::Logger::DEBUG, use_silence = true) if logger && logger.level >= log_level @@ -25,4 +25,4 @@ module AbstractController end end end -end
\ No newline at end of file +end |