Merge pull request #4790 from marten/fix-require-deprecation-in-activ…

…esupport Fix Deprecation usage in ActiveSupport when requiring only parts of AS
rails · Jan 31, 2012 · 7beb5a7 · 7beb5a7
2 parents 175cdd1 + 2380a2d
commit 7beb5a7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/activesupport/lib/active_support/base64.rb b/activesupport/lib/active_support/base64.rb
@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
 begin
   require 'base64'
 rescue LoadError

diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb
@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
 module ActiveSupport
   # A typical module looks like this:
   #

diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
@@ -1,4 +1,5 @@
 require 'active_support/base64'
+require 'active_support/deprecation'
 require 'active_support/core_ext/object/blank'
 
 module ActiveSupport

diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb
@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
 # Extensions to +nil+ which allow for more helpful error messages for people who
 # are new to Rails.
 #