aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-10-29 06:20:21 -0700
committerXavier Noria <fxn@hashref.com>2011-10-29 06:20:21 -0700
commite22a4c6f28296684171d8b033aab57d8380a2c74 (patch)
tree95a009c72a5ceb75556908a1051f44d7e81042f5 /railties/lib/rails
parent74f3f19a8345220949a1cb06030b58c621c7f798 (diff)
parent3fa8f362ad09a6f94ab012094014e31513ee36e0 (diff)
downloadrails-e22a4c6f28296684171d8b033aab57d8380a2c74.tar.gz
rails-e22a4c6f28296684171d8b033aab57d8380a2c74.tar.bz2
rails-e22a4c6f28296684171d8b033aab57d8380a2c74.zip
Merge pull request #3460 from arunagw/method_redefine_warning_removed
method redefined warning removed!
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/test_unit/testing.rake1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index fa01f42c5b..3d87529ad4 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -61,6 +61,7 @@ end
# Recreated here from Active Support because :uncommitted needs it before Rails is available
module Kernel
+ remove_method :silence_stderr # Removing old method to prevent method redefined warning
def silence_stderr
old_stderr = STDERR.dup
STDERR.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')