aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2013-06-26 14:48:40 +0200
committerŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2013-08-25 11:39:07 +0200
commitc48ce6e73d1f0765902779adab3242b5f4a893c6 (patch)
treed3cb5487f88ec5ae10742160fa0f55f2b152f266 /actionpack/lib/action_controller
parentb2ae1fae5d332569df6e1beb94cbfd4f4892b9bb (diff)
downloadrails-c48ce6e73d1f0765902779adab3242b5f4a893c6.tar.gz
rails-c48ce6e73d1f0765902779adab3242b5f4a893c6.tar.bz2
rails-c48ce6e73d1f0765902779adab3242b5f4a893c6.zip
Move layouts to AV
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 67d261db77..1f7ce468b3 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1,3 +1,4 @@
+require "action_view/layouts"
require "action_controller/log_subscriber"
require "action_controller/metal/params_wrapper"
@@ -200,7 +201,6 @@ module ActionController
end
MODULES = [
- AbstractController::Layouts,
AbstractController::Translation,
AbstractController::AssetPaths,