From 3fd2e724770810b5d5e8941b2f3861c4e859c517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?=
 <lukasz.strzalkowski@gmail.com>
Date: Tue, 16 Jul 2013 15:25:25 +0200
Subject: Load AV::Layouts dynamicly via railties

---
 actionpack/lib/action_controller/base.rb            | 1 -
 actionpack/lib/action_controller/metal/streaming.rb | 2 --
 2 files changed, 3 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 80b5f118ff..ff0a7bf6ce 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -210,7 +210,6 @@ module ActionController
     end
 
     MODULES = [
-      ActionView::Layouts,
       AbstractController::Translation,
       AbstractController::AssetPaths,
 
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 2c86d7136c..b017415486 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/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
-- 
cgit v1.2.3