Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silence

Add a "silence" behavior to completely turn off deprecation warnings.

1 files changed, 10 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb
index 94f8d7133e..73b6a42505 100644
--- a/activesupport/lib/active_support/deprecation/behaviors.rb
+++ b/activesupport/lib/active_support/deprecation/behaviors.rb
@@ -13,6 +13,13 @@ module ActiveSupport
 
       # Sets the behavior to the specified value. Can be a single value or an array.
       #
+      # Available behaviors: 
+      #
+      # [+:stderr+] Print deprecations to +$stderror+
+      # [+:log+] Send to +Rails.logger+
+      # [+:notify+] Instrument using +ActiveSupport::Notifications+
+      # [+:silence+] Do nothing
+      #
       # Examples
       #
       #   ActiveSupport::Deprecation.behavior = :stderr
@@ -41,8 +48,9 @@ module ActiveSupport
        },
        :notify => Proc.new { |message, callstack|
           ActiveSupport::Notifications.instrument("deprecation.rails",
-            :message => message, :callstack => callstack)
-       }
+          :message => message, :callstack => callstack)
+       },
+       :silence => Proc.new { |message, callstack| }
     }
   end
 end