aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/railtie.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-08-21 12:58:25 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-08-21 12:58:25 -0700
commit6bef1469d2e43d0815b70588370470983a4320af (patch)
tree7d1f2f5cc9506507e02cc13d2b6ff7f614a8ca88 /actionpack/lib/action_controller/railtie.rb
parent11e890fef8982caa206e4fbc033f896e6ad424a1 (diff)
parentda3d28ea33a7e418c99e89aa6b4028ba054f1f39 (diff)
downloadrails-6bef1469d2e43d0815b70588370470983a4320af.tar.gz
rails-6bef1469d2e43d0815b70588370470983a4320af.tar.bz2
rails-6bef1469d2e43d0815b70588370470983a4320af.zip
Merge pull request #7225 from rails/eager_load
Improve eager load on Rails
Diffstat (limited to 'actionpack/lib/action_controller/railtie.rb')
-rw-r--r--actionpack/lib/action_controller/railtie.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 851a2c4aee..3ecc105e22 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -9,6 +9,8 @@ module ActionController
class Railtie < Rails::Railtie #:nodoc:
config.action_controller = ActiveSupport::OrderedOptions.new
+ config.eager_load_namespaces << ActionController
+
initializer "action_controller.assets_config", :group => :all do |app|
app.config.action_controller.assets_dir ||= app.config.paths["public"].first
end