Skip to content
Browse files

Load AV::Layouts dynamicly via railties

  • Loading branch information...
1 parent d6363aa commit 3fd2e724770810b5d5e8941b2f3861c4e859c517 @lukaszx0 lukaszx0 committed Jul 16, 2013
View
1 actionpack/lib/action_controller/base.rb
@@ -210,7 +210,6 @@ def self.without_modules(*modules)
end
MODULES = [
- ActionView::Layouts,
AbstractController::Translation,
AbstractController::AssetPaths,
View
2 actionpack/lib/action_controller/metal/streaming.rb
@@ -193,8 +193,6 @@ module ActionController #:nodoc:
module Streaming
extend ActiveSupport::Concern
- include ActionView::Rendering
-
protected
# Set proper cache control and transfer encoding when streaming
View
2 actionpack/test/abstract_unit.rb
@@ -268,6 +268,8 @@ def assert_header(name, value)
end
end
+ActionController::Base.superclass.send(:include, ActionView::Layouts)
+
module ActionController
class Base
include ActionController::Testing
View
2 actionview/lib/action_view/railtie.rb
@@ -38,7 +38,7 @@ class Railtie < Rails::Railtie # :nodoc:
initializer "action_view.setup_action_pack" do |app|
ActiveSupport.on_load(:action_controller) do
- ActionController::Base.send(:include, ActionView::Layouts)
+ ActionController::Base.superclass.send(:include, ActionView::Layouts)
end
end
end
View
2 actionview/test/abstract_unit.rb
@@ -268,6 +268,8 @@ def assert_header(name, value)
end
end
+ActionController::Base.superclass.send(:include, ActionView::Layouts)
+
module ActionController
class Base
include ActionController::Testing

0 comments on commit 3fd2e72

Please sign in to comment.
Something went wrong with that request. Please try again.