diff options
| author | José Valim <jose.valim@gmail.com> | 2012-04-01 04:44:25 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-04-01 04:44:25 -0700 |
| commit | 9228aa6f50f943193befc3ca7612d5bbda287c86 (patch) | |
| tree | 42cc3a7417995d26e646db7af4f65361b64c0151 | |
| parent | e357d5b99343f6470dd3fe8bfc410a4227f3ba93 (diff) | |
| parent | ee235b3d3a5993d95f9ae5abbfb745f73c4903ba (diff) | |
| download | rails-9228aa6f50f943193befc3ca7612d5bbda287c86.tar.gz rails-9228aa6f50f943193befc3ca7612d5bbda287c86.tar.bz2 rails-9228aa6f50f943193befc3ca7612d5bbda287c86.zip | |
Merge pull request #5690 from nertzy/remove_naming_deprecation_include
Don't include deprecation in ActiveModel::Naming anymore
| -rw-r--r-- | activemodel/lib/active_model/naming.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb index adf000e53c..5665e10002 100644 --- a/activemodel/lib/active_model/naming.rb +++ b/activemodel/lib/active_model/naming.rb @@ -1,7 +1,6 @@ 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/core_ext/module/delegation' require 'active_support/core_ext/object/blank' |