aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJens Kraemer <jk@jkraemer.net>2012-06-10 11:22:56 +0200
committerJens Kraemer <jk@jkraemer.net>2012-06-10 11:22:56 +0200
commite66c240a8f46eba1f7d0816c9d72e5cb89f997da (patch)
tree8ed713599af61ffbc374f157036b84019241ebcb /activesupport/lib
parenteaeebc28840b06008aa9aa0e238cdc2331278a10 (diff)
downloadrails-e66c240a8f46eba1f7d0816c9d72e5cb89f997da.tar.gz
rails-e66c240a8f46eba1f7d0816c9d72e5cb89f997da.tar.bz2
rails-e66c240a8f46eba1f7d0816c9d72e5cb89f997da.zip
fix namespace collision with test-unit-activesupport
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/testing/deprecation.rb2
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