aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
diff options
context:
space:
mode:
authorPaul McMahon <paul@mobalean.com>2012-01-25 11:14:01 +0900
committerPaul McMahon <paul@mobalean.com>2012-01-25 11:14:01 +0900
commit75d58fef26bcd52cf5c814466836c4b527a6547c (patch)
tree5ecc07869abf3a7a01ad296453165ae3afb85abc /activemodel/lib/active_model
parentf36dcaf488b4357a52f43e3912628428956d351f (diff)
downloadrails-75d58fef26bcd52cf5c814466836c4b527a6547c.tar.gz
rails-75d58fef26bcd52cf5c814466836c4b527a6547c.tar.bz2
rails-75d58fef26bcd52cf5c814466836c4b527a6547c.zip
allow requiring of 'active_model/naming'
Requiring 'active_model/naming' will raise an uninitialized constant ActiveSupport::Deprecation exception because the module core extension doesn't require 'active_support/deprecation'. This require cannot be added to the core extension because of circular dependency issues.
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r--activemodel/lib/active_model/naming.rb2
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