From 6c7d895ddae5a7a696a9a047e025e9e4e305f790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?=
 <lukasz.strzalkowski@gmail.com>
Date: Tue, 30 Jul 2013 00:34:19 +0200
Subject: [PATCH] Do not load AV inside AP

Move that part to AV railtie
---
 actionpack/lib/action_controller.rb         | 8 --------
 actionpack/lib/action_controller/railtie.rb | 1 -
 actionview/lib/action_view/railtie.rb       | 1 +
 actionview/test/abstract_unit.rb            | 1 +
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index cc03da4904..d08e3c4e8e 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -50,14 +50,6 @@ module ActionController
   end
 end
 
-# All of these simply register additional autoloads
-require 'action_view'
-require 'action_view/vendor/html-scanner'
-
-ActiveSupport.on_load(:action_view) do
-  ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
-end
-
 # Common Active Support usage in Action Controller
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/load_error'
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 5379547c57..0833e65d23 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -1,7 +1,6 @@
 require "rails"
 require "action_controller"
 require "action_dispatch/railtie"
-require "action_view/railtie"
 require "abstract_controller/railties/routes_helpers"
 require "action_controller/railties/helpers"
 
diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb
index 8382023e06..4113448af0 100644
--- a/actionview/lib/action_view/railtie.rb
+++ b/actionview/lib/action_view/railtie.rb
@@ -39,6 +39,7 @@ module ActionView
     initializer "action_view.setup_action_pack", before: :add_view_paths do |app|
       ActiveSupport.on_load(:action_controller) do
         ActionController::Base.superclass.send(:include, ActionView::Layouts)
+        ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
       end
     end
 
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
index e4d0b53b59..6623b47e83 100644
--- a/actionview/test/abstract_unit.rb
+++ b/actionview/test/abstract_unit.rb
@@ -269,6 +269,7 @@ end
 
 # Emulate AV railtie.
 ActionController::Base.superclass.send(:include, ActionView::Layouts)
+ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
 
 module ActionController
   class Base