diff options
author | José Valim <jose.valim@plataformatec.com.br> | 2012-06-10 02:39:27 -0700 |
---|---|---|
committer | José Valim <jose.valim@plataformatec.com.br> | 2012-06-10 02:39:27 -0700 |
commit | 6cc941dedbc435efa65cce896e7c6bf5fa519e99 (patch) | |
tree | 8ed713599af61ffbc374f157036b84019241ebcb | |
parent | eaeebc28840b06008aa9aa0e238cdc2331278a10 (diff) | |
parent | e66c240a8f46eba1f7d0816c9d72e5cb89f997da (diff) | |
download | rails-6cc941dedbc435efa65cce896e7c6bf5fa519e99.tar.gz rails-6cc941dedbc435efa65cce896e7c6bf5fa519e99.tar.bz2 rails-6cc941dedbc435efa65cce896e7c6bf5fa519e99.zip |
Merge pull request #6693 from jkraemer/3-2-stable
Bugfix: Namespace collision with test-unit-activesupport 1.0.0
-rw-r--r-- | activesupport/lib/active_support/testing/deprecation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/deprecation.rb b/activesupport/lib/active_support/testing/deprecation.rb index 0135185a47..36824134da 100644 --- a/activesupport/lib/active_support/testing/deprecation.rb +++ b/activesupport/lib/active_support/testing/deprecation.rb @@ -45,7 +45,7 @@ else class Error #:nodoc: # Silence warnings when reporting test errors. def message_with_silenced_deprecation - ActiveSupport::Deprecation.silence { message_without_silenced_deprecation } + ::ActiveSupport::Deprecation.silence { message_without_silenced_deprecation } end alias_method :message_without_silenced_deprecation, :message alias_method :message, :message_with_silenced_deprecation |