parent
9e6a1439d1
commit
6c7d895dda
|
@ -50,14 +50,6 @@ module ActionController
|
||||||
end
|
end
|
||||||
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
|
# Common Active Support usage in Action Controller
|
||||||
require 'active_support/core_ext/class/attribute_accessors'
|
require 'active_support/core_ext/class/attribute_accessors'
|
||||||
require 'active_support/core_ext/load_error'
|
require 'active_support/core_ext/load_error'
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
require "rails"
|
require "rails"
|
||||||
require "action_controller"
|
require "action_controller"
|
||||||
require "action_dispatch/railtie"
|
require "action_dispatch/railtie"
|
||||||
require "action_view/railtie"
|
|
||||||
require "abstract_controller/railties/routes_helpers"
|
require "abstract_controller/railties/routes_helpers"
|
||||||
require "action_controller/railties/helpers"
|
require "action_controller/railties/helpers"
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,7 @@ module ActionView
|
||||||
initializer "action_view.setup_action_pack", before: :add_view_paths do |app|
|
initializer "action_view.setup_action_pack", before: :add_view_paths do |app|
|
||||||
ActiveSupport.on_load(:action_controller) do
|
ActiveSupport.on_load(:action_controller) do
|
||||||
ActionController::Base.superclass.send(:include, ActionView::Layouts)
|
ActionController::Base.superclass.send(:include, ActionView::Layouts)
|
||||||
|
ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -269,6 +269,7 @@ end
|
||||||
|
|
||||||
# Emulate AV railtie.
|
# Emulate AV railtie.
|
||||||
ActionController::Base.superclass.send(:include, ActionView::Layouts)
|
ActionController::Base.superclass.send(:include, ActionView::Layouts)
|
||||||
|
ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
|
||||||
|
|
||||||
module ActionController
|
module ActionController
|
||||||
class Base
|
class Base
|
||||||
|
|
Loading…
Reference in New Issue