From 077372b20d1024eace791af27792b71c0b7ccdb9 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Thu, 2 Aug 2012 21:34:44 +0200
Subject: load active_support/deprecation in active_support/rails

---
 actionpack/lib/action_view/helpers/form_helper.rb                      | 1 -
 activemodel/lib/active_model/attribute_methods.rb                      | 1 -
 activemodel/lib/active_model/observing.rb                              | 1 -
 activerecord/lib/active_record/associations/association.rb             | 1 -
 .../lib/active_record/associations/builder/collection_association.rb   | 1 -
 activerecord/lib/active_record/attribute_methods.rb                    | 1 -
 activerecord/lib/active_record/base.rb                                 | 1 -
 .../active_record/connection_adapters/abstract/schema_statements.rb    | 1 -
 activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 1 -
 activerecord/lib/active_record/connection_adapters/column.rb           | 1 -
 activerecord/lib/active_record/migration.rb                            | 1 -
 activerecord/lib/active_record/model.rb                                | 1 -
 activerecord/lib/active_record/querying.rb                             | 1 -
 activerecord/lib/active_record/relation.rb                             | 1 -
 activerecord/lib/active_record/scoping/default.rb                      | 1 -
 activerecord/lib/active_record/scoping/named.rb                        | 1 -
 activerecord/lib/active_record/test_case.rb                            | 1 -
 activerecord/test/cases/helper.rb                                      | 2 +-
 activerecord/test/cases/test_case.rb                                   | 1 -
 activesupport/lib/active_support/rails.rb                              | 3 +++
 20 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 08e2cd100e..13a5671a17 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -8,7 +8,6 @@ require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/string/output_safety'
 require 'active_support/core_ext/array/extract_options'
-require 'active_support/deprecation'
 require 'active_support/core_ext/string/inflections'
 require 'action_controller/model_naming'
 
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'
 
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
index c1b856029f..4db7038d2e 100644
--- a/activerecord/lib/active_record/associations/association.rb
+++ b/activerecord/lib/active_record/associations/association.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/array/wrap'
-require 'active_support/deprecation'
 
 module ActiveRecord
   module Associations
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb
index dbddae0876..3fb0a57450 100644
--- a/activerecord/lib/active_record/associations/builder/collection_association.rb
+++ b/activerecord/lib/active_record/associations/builder/collection_association.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
 
 module ActiveRecord::Associations::Builder
   class CollectionAssociation < Association #:nodoc:
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index f36df4a444..ced15bc330 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/enumerable'
-require 'active_support/deprecation'
 
 module ActiveRecord
   # = Active Record Attribute Methods
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index ca8cc89ae9..6df68bade0 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -14,7 +14,6 @@ require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/kernel/singleton_class'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/object/duplicable'
-require 'active_support/deprecation'
 require 'arel'
 require 'active_record/errors'
 require 'active_record/log_subscriber'
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 09f103100e..86d6266af9 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation/reporting'
 require 'active_record/migration/join_table'
 
 module ActiveRecord
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 28a9821913..b3f9187429 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -2,7 +2,6 @@ require 'date'
 require 'bigdecimal'
 require 'bigdecimal/util'
 require 'active_support/core_ext/benchmark'
-require 'active_support/deprecation'
 require 'active_record/connection_adapters/schema_cache'
 require 'monitor'
 
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index 01bd3ae26c..b9045cf1e7 100644
--- a/activerecord/lib/active_record/connection_adapters/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/column.rb
@@ -1,5 +1,4 @@
 require 'set'
-require 'active_support/deprecation'
 
 module ActiveRecord
   # :stopdoc:
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index c12fe69166..7cbe61f14d 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -1,5 +1,4 @@
 require "active_support/core_ext/class/attribute_accessors"
-require 'active_support/deprecation'
 require 'set'
 
 module ActiveRecord
diff --git a/activerecord/lib/active_record/model.rb b/activerecord/lib/active_record/model.rb
index 6d358b1dc0..3d0a39e979 100644
--- a/activerecord/lib/active_record/model.rb
+++ b/activerecord/lib/active_record/model.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
 require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveRecord
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb
index 484543f47c..79713b6970 100644
--- a/activerecord/lib/active_record/querying.rb
+++ b/activerecord/lib/active_record/querying.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
 
 module ActiveRecord
   module Querying
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 25b80f542c..9ed3256ae9 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-require 'active_support/deprecation'
 
 module ActiveRecord
   # = Active Record Relation
diff --git a/activerecord/lib/active_record/scoping/default.rb b/activerecord/lib/active_record/scoping/default.rb
index 20c361f2f3..a2a85d4b96 100644
--- a/activerecord/lib/active_record/scoping/default.rb
+++ b/activerecord/lib/active_record/scoping/default.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
 
 module ActiveRecord
   module Scoping
diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb
index eb473da306..75f31229b5 100644
--- a/activerecord/lib/active_record/scoping/named.rb
+++ b/activerecord/lib/active_record/scoping/named.rb
@@ -1,7 +1,6 @@
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/deprecation'
 
 module ActiveRecord
   # = Active Record Named \Scopes
diff --git a/activerecord/lib/active_record/test_case.rb b/activerecord/lib/active_record/test_case.rb
index c7a6c37d50..c035ad43a2 100644
--- a/activerecord/lib/active_record/test_case.rb
+++ b/activerecord/lib/active_record/test_case.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
 require 'active_support/test_case'
 
 ActiveSupport::Deprecation.warn('ActiveRecord::TestCase is deprecated, please use ActiveSupport::TestCase')
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 44d08a8ee4..018064233a 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -6,8 +6,8 @@ gem 'minitest'
 require 'minitest/autorun'
 require 'stringio'
 
-require 'cases/test_case'
 require 'active_record'
+require 'cases/test_case'
 require 'active_support/dependencies'
 require 'active_support/logger'
 
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index 94a13d386c..f3f7054794 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
 ActiveSupport::Deprecation.silence do
   require 'active_record/test_case'
 end
diff --git a/activesupport/lib/active_support/rails.rb b/activesupport/lib/active_support/rails.rb
index ff7000d812..933c6e6136 100644
--- a/activesupport/lib/active_support/rails.rb
+++ b/activesupport/lib/active_support/rails.rb
@@ -25,3 +25,6 @@ require 'active_support/core_ext/class/attribute'
 
 # Defines Module#delegate.
 require 'active_support/core_ext/module/delegation'
+
+# Defines ActiveSupport::Deprecation.
+require 'active_support/deprecation'
-- 
cgit v1.2.3