Permalink
Browse files

load active_support/deprecation in active_support/rails

  • Loading branch information...
1 parent 4aee8dd commit 077372b20d1024eace791af27792b71c0b7ccdb9 @fxn fxn committed Aug 2, 2012
View
1 actionpack/lib/action_view/helpers/form_helper.rb
@@ -8,7 +8,6 @@
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'
View
1 activemodel/lib/active_model/attribute_methods.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
module ActiveModel
# Raised when an attribute is not defined.
View
1 activemodel/lib/active_model/observing.rb
@@ -4,7 +4,6 @@
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'
View
1 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
View
1 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:
View
1 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
View
1 activerecord/lib/active_record/base.rb
@@ -14,7 +14,6 @@
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'
View
1 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
View
1 activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -2,7 +2,6 @@
require 'bigdecimal'
require 'bigdecimal/util'
require 'active_support/core_ext/benchmark'
-require 'active_support/deprecation'
require 'active_record/connection_adapters/schema_cache'
require 'monitor'
View
1 activerecord/lib/active_record/connection_adapters/column.rb
@@ -1,5 +1,4 @@
require 'set'
-require 'active_support/deprecation'
module ActiveRecord
# :stopdoc:
View
1 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
View
1 activerecord/lib/active_record/model.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
require 'active_support/core_ext/module/attribute_accessors'
module ActiveRecord
View
1 activerecord/lib/active_record/querying.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
module ActiveRecord
module Querying
View
1 activerecord/lib/active_record/relation.rb
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
-require 'active_support/deprecation'
module ActiveRecord
# = Active Record Relation
View
1 activerecord/lib/active_record/scoping/default.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
module ActiveRecord
module Scoping
View
1 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
View
1 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')
View
2 activerecord/test/cases/helper.rb
@@ -6,8 +6,8 @@
require 'minitest/autorun'
require 'stringio'
-require 'cases/test_case'
require 'active_record'
+require 'cases/test_case'
require 'active_support/dependencies'
require 'active_support/logger'
View
1 activerecord/test/cases/test_case.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
ActiveSupport::Deprecation.silence do
require 'active_record/test_case'
end
View
3 activesupport/lib/active_support/rails.rb
@@ -25,3 +25,6 @@
# Defines Module#delegate.
require 'active_support/core_ext/module/delegation'
+
+# Defines ActiveSupport::Deprecation.
+require 'active_support/deprecation'

0 comments on commit 077372b

Please sign in to comment.