aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-08-02 21:34:44 +0200
committerXavier Noria <fxn@hashref.com>2012-08-02 21:59:23 +0200
commit077372b20d1024eace791af27792b71c0b7ccdb9 (patch)
treea7266126556e40aee03257b54086a206c5279b21 /activemodel
parent4aee8dd486828943fb414504500efdbcfb49f884 (diff)
downloadrails-077372b20d1024eace791af27792b71c0b7ccdb9.tar.gz
rails-077372b20d1024eace791af27792b71c0b7ccdb9.tar.bz2
rails-077372b20d1024eace791af27792b71c0b7ccdb9.zip
load active_support/deprecation in active_support/rails
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/attribute_methods.rb1
-rw-r--r--activemodel/lib/active_model/observing.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index ff2ee029f8..21b1209875 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
module ActiveModel
# Raised when an attribute is not defined.
diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
index 976dcf23d8..ab8bcae402 100644
--- a/activemodel/lib/active_model/observing.rb
+++ b/activemodel/lib/active_model/observing.rb
@@ -4,7 +4,6 @@ require 'active_support/core_ext/module/aliasing'
require 'active_support/core_ext/module/remove_method'
require 'active_support/core_ext/string/inflections'
require 'active_support/core_ext/enumerable'
-require 'active_support/deprecation'
require 'active_support/core_ext/object/try'
require 'active_support/descendants_tracker'