From 8c2c95e5d22d5e1ebade26f6eeaeda5089e4f658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?=
 <lukasz.strzalkowski@gmail.com>
Date: Fri, 28 Jun 2013 16:46:10 +0200
Subject: Fix AP test suite after moving stuff to AV

---
 actionpack/lib/abstract_controller.rb    | 1 +
 actionpack/lib/action_controller/base.rb | 1 +
 2 files changed, 2 insertions(+)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index c905c45b40..909b438a41 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -10,6 +10,7 @@ module AbstractController
   autoload :Base
   autoload :Callbacks
   autoload :Collector
+  autoload :DoubleRenderError, "abstract_controller/rendering.rb"
   autoload :Helpers
   autoload :Logger
   autoload :Translation
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 1f7ce468b3..ebb7cc2a64 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -201,6 +201,7 @@ module ActionController
     end
 
     MODULES = [
+      ActionView::Layouts,
       AbstractController::Translation,
       AbstractController::AssetPaths,
 
-- 
cgit v1.2.3