diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-01-31 05:29:11 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-01-31 05:29:11 -0800 |
| commit | 7beb5a71f39f08c2b41a8f9b39f64e126d72bd79 (patch) | |
| tree | fb18035c7feeb5eae171c14bf4b40157588bb7e2 | |
| parent | 175cdd11f4e956113c2123d548528ebc36688946 (diff) | |
| parent | 2380a2d76c9b73408ca248d2926a304d8e28158f (diff) | |
| download | rails-7beb5a71f39f08c2b41a8f9b39f64e126d72bd79.tar.gz rails-7beb5a71f39f08c2b41a8f9b39f64e126d72bd79.tar.bz2 rails-7beb5a71f39f08c2b41a8f9b39f64e126d72bd79.zip | |
Merge pull request #4790 from marten/fix-require-deprecation-in-activesupport
Fix Deprecation usage in ActiveSupport when requiring only parts of AS
| -rw-r--r-- | activesupport/lib/active_support/base64.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/concern.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/message_verifier.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/whiny_nil.rb | 2 |
4 files changed, 7 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/base64.rb b/activesupport/lib/active_support/base64.rb index f0cfdedaa0..da141071fb 100644 --- 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 index af3da937c7..97fa2db4a9 100644 --- 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 index be5b7ef79f..0d9580abca 100644 --- 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 index a065233679..adf9a35ee6 100644 --- 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. # |