aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-08-02 18:07:20 +0200
committerXavier Noria <fxn@hashref.com>2012-08-02 21:59:22 +0200
commit1a7b2e8fadc34a70ad891b3b111a06e384fd3c6d (patch)
tree6631dcdaf05187635883cb78b4b1b1d5f273699e /actionpack/lib
parent7a7ec74c1c32667e93f4bcd11d227d6134b0fa59 (diff)
downloadrails-1a7b2e8fadc34a70ad891b3b111a06e384fd3c6d.tar.gz
rails-1a7b2e8fadc34a70ad891b3b111a06e384fd3c6d.tar.bz2
rails-1a7b2e8fadc34a70ad891b3b111a06e384fd3c6d.zip
defines a private require-hub active_support/rails
This is a private place to put those AS features that are used by every component. Nowadays we cherry-pick individual files wherever they are used, but that it is not worth the effort for stuff that is going to be loaded for sure sooner or later, like blank?, autoload, concern, etc.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/abstract_controller.rb1
-rw-r--r--actionpack/lib/action_controller.rb1
-rw-r--r--actionpack/lib/action_dispatch.rb1
-rw-r--r--actionpack/lib/action_view.rb1
4 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index b95ea5f0b2..50ed73a430 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -1,4 +1,5 @@
require 'action_pack'
+require 'active_support/rails'
require 'active_support/concern'
require 'active_support/dependencies/autoload'
require 'active_support/core_ext/class/attribute'
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 1d06c83338..c17d3f3fe2 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -1,3 +1,4 @@
+require 'active_support/rails'
require 'abstract_controller'
require 'action_dispatch'
require 'action_controller/metal/live'
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index c259b865cc..0bc0ecbbe9 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -22,6 +22,7 @@
#++
require 'active_support'
+require 'active_support/rails'
require 'active_support/dependencies/autoload'
require 'active_support/core_ext/module/attribute_accessors'
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 03dfa110e3..4bd72c5520 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -22,6 +22,7 @@
#++
require 'active_support'
+require 'active_support/rails'
require 'action_pack'
module ActionView