diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-06-28 16:46:10 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:08 +0200 |
| commit | 8c2c95e5d22d5e1ebade26f6eeaeda5089e4f658 (patch) | |
| tree | 0add4bc56b06b30f4adf6097083ad88810d9fc74 /actionpack/lib | |
| parent | 75d38e4364a292d8fddb89ff9959c88ab00ad7e9 (diff) | |
| download | rails-8c2c95e5d22d5e1ebade26f6eeaeda5089e4f658.tar.gz rails-8c2c95e5d22d5e1ebade26f6eeaeda5089e4f658.tar.bz2 rails-8c2c95e5d22d5e1ebade26f6eeaeda5089e4f658.zip | |
Fix AP test suite after moving stuff 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 | 1 |
2 files changed, 2 insertions, 0 deletions
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, |