diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/benchmarkable.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index c36df796a8..c10a0b390b 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,5 +1,9 @@ ## Rails 4.0.0 (unreleased) ## +* ActiveSupport::Benchmarkable#silence has been deprecated due to its lack of + thread safety. It will be removed without replacement in Rails 4.1. *Steve + Klabnik* + * An optional block can be passed to `Hash#deep_merge`. The block will be invoked for each duplicated key and used to resolve the conflict. *Pranas Kiziela* diff --git a/activesupport/lib/active_support/benchmarkable.rb b/activesupport/lib/active_support/benchmarkable.rb index f149a7f0ed..1b391697e6 100644 --- a/activesupport/lib/active_support/benchmarkable.rb +++ b/activesupport/lib/active_support/benchmarkable.rb @@ -46,6 +46,7 @@ module ActiveSupport # Silence the logger during the execution of the block. # def silence + ActiveSupport::Deprecation.warn "ActiveSupport::Benchmarkable#silence is deprecated. It will be removed from Rails 4.1." old_logger_level, logger.level = logger.level, ::Logger::ERROR if logger yield ensure |