diff options
author | José Valim <jose.valim@gmail.com> | 2012-01-24 19:52:45 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-01-24 19:52:45 -0800 |
commit | 9e9e17a62e4de59679532a509d3c86dbded101f7 (patch) | |
tree | 466e7eacb7d947ae14375052c59346e3a7bee880 | |
parent | 1d67f1ade761db75bceb30d914c4280cc3dbc984 (diff) | |
parent | 75d58fef26bcd52cf5c814466836c4b527a6547c (diff) | |
download | rails-9e9e17a62e4de59679532a509d3c86dbded101f7.tar.gz rails-9e9e17a62e4de59679532a509d3c86dbded101f7.tar.bz2 rails-9e9e17a62e4de59679532a509d3c86dbded101f7.zip |
Merge pull request #4654 from pwim/explicit-deprecation-require
Explicit deprecation require
-rw-r--r-- | activemodel/lib/active_model/naming.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb index 755e54efcd..a253be6765 100644 --- a/activemodel/lib/active_model/naming.rb +++ b/activemodel/lib/active_model/naming.rb @@ -1,7 +1,7 @@ require 'active_support/inflector' require 'active_support/core_ext/hash/except' require 'active_support/core_ext/module/introspection' -require 'active_support/core_ext/module/deprecation' +require 'active_support/deprecation' module ActiveModel class Name < String |