Permalink
Browse files

load active_support/concern in active_support/rails

  • Loading branch information...
1 parent 47396a9 commit 64bc8447c2ccfba74939a556358f845980621a91 @fxn fxn committed Aug 2, 2012
@@ -1,6 +1,5 @@
require 'action_pack'
require 'active_support/rails'
-require 'active_support/concern'
require 'active_support/core_ext/class/attribute'
require 'active_support/core_ext/module/attr_internal'
require 'active_support/core_ext/module/delegation'
@@ -55,7 +55,6 @@ module ActionController
require 'action_controller/vendor/html-scanner'
# Common Active Support usage in Action Controller
-require 'active_support/concern'
require 'active_support/core_ext/class/attribute_accessors'
require 'active_support/core_ext/load_error'
require 'active_support/core_ext/module/attr_internal'
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/core_ext/file'
require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/core_ext/file'
require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/inflector'
module ActiveModel
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
ActiveSupport.on_load(:active_record_config) do
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/core_ext/hash/indifferent_access'
require 'active_support/core_ext/object/deep_dup'
require 'active_support/core_ext/module/delegation'
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
ActiveSupport.on_load(:active_record_config) do
@@ -1,5 +1,4 @@
require 'active_support/deprecation'
-require 'active_support/concern'
require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/module/attribute_accessors'
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
ActiveSupport.on_load(:active_record_config) do
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
# = Active Record Persistence
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/core_ext/class/attribute'
module ActiveRecord
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
module Sanitization
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
module Scoping
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/deprecation'
module ActiveRecord
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/core_ext/hash/indifferent_access'
require 'active_support/core_ext/class/attribute'
@@ -16,3 +16,6 @@
# Rails own autoload, eager_load, etc.
require 'active_support/dependencies/autoload'
+
+# support for ClassMethods and the included macro
+require 'active_support/concern'

0 comments on commit 64bc844

Please sign in to comment.