Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

load active_support/concern in active_support/rails

  • Loading branch information...
commit 64bc8447c2ccfba74939a556358f845980621a91 1 parent 47396a9
@fxn fxn authored
View
1  actionpack/lib/abstract_controller.rb
@@ -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'
View
1  actionpack/lib/action_controller.rb
@@ -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'
View
1  actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/core_ext/file'
require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
View
1  actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/core_ext/file'
require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
View
1  activemodel/lib/active_model/conversion.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/inflector'
module ActiveModel
View
1  activerecord/lib/active_record/attribute_assignment.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
ActiveSupport.on_load(:active_record_config) do
View
1  activerecord/lib/active_record/core.rb
@@ -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'
View
1  activerecord/lib/active_record/inheritance.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
ActiveSupport.on_load(:active_record_config) do
View
1  activerecord/lib/active_record/model.rb
@@ -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'
View
1  activerecord/lib/active_record/model_schema.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
ActiveSupport.on_load(:active_record_config) do
View
1  activerecord/lib/active_record/persistence.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
# = Active Record Persistence
View
1  activerecord/lib/active_record/readonly_attributes.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/core_ext/class/attribute'
module ActiveRecord
View
1  activerecord/lib/active_record/sanitization.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
module Sanitization
View
1  activerecord/lib/active_record/scoping.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
module ActiveRecord
module Scoping
View
1  activerecord/lib/active_record/scoping/default.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/deprecation'
module ActiveRecord
View
1  activerecord/lib/active_record/store.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
require 'active_support/core_ext/hash/indifferent_access'
require 'active_support/core_ext/class/attribute'
View
3  activesupport/lib/active_support/rails.rb
@@ -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.
Something went wrong with that request. Please try again.