diff options
| 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 |
| commit | c48ce6e73d1f0765902779adab3242b5f4a893c6 (patch) | |
| tree | d3cb5487f88ec5ae10742160fa0f55f2b152f266 /actionpack/lib | |
| parent | b2ae1fae5d332569df6e1beb94cbfd4f4892b9bb (diff) | |
| download | rails-c48ce6e73d1f0765902779adab3242b5f4a893c6.tar.gz rails-c48ce6e73d1f0765902779adab3242b5f4a893c6.tar.bz2 rails-c48ce6e73d1f0765902779adab3242b5f4a893c6.zip | |
Move layouts to AV
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb index 7ab5af00c3..c905c45b40 100644 --- a/actionpack/lib/abstract_controller.rb +++ b/actionpack/lib/abstract_controller.rb @@ -11,7 +11,6 @@ module AbstractController autoload :Callbacks autoload :Collector autoload :Helpers - autoload :Layouts autoload :Logger autoload :Translation autoload :AssetPaths 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, |