aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xactivesupport/lib/active_support/breakpoint.rb5
-rw-r--r--activesupport/lib/active_support/deprecation.rb3
2 files changed, 8 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/breakpoint.rb b/activesupport/lib/active_support/breakpoint.rb
index 785dac7596..8207117ced 100755
--- a/activesupport/lib/active_support/breakpoint.rb
+++ b/activesupport/lib/active_support/breakpoint.rb
@@ -460,6 +460,11 @@ module IRB #:nodoc:
old_CurrentContext
end
end
+
+ class << self
+ alias :old_parse_opts :parse_opts
+ remove_method :parse_opts
+ end
def IRB.parse_opts() end
class Context #:nodoc:
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb
index 845fb4d62b..22ff90642a 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -65,6 +65,9 @@ module ActiveSupport
mattr_accessor :behavior
self.behavior = default_behavior
+ # Warnings are not silenced by default.
+ self.silenced = false
+
module ClassMethods
# Declare that a method has been deprecated.
def deprecate(*method_names)