diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-12-08 13:03:41 +0100 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-12-08 13:03:41 +0100 |
| commit | d99dd0af039f73039edce68a4930b1c0a52f8f01 (patch) | |
| tree | ff522e618e9ad7034db41bbf591d9969db6e2412 | |
| parent | 99975e742eb2636cd814f2c9de21f4bd3c3dbbc7 (diff) | |
| download | rails-d99dd0af039f73039edce68a4930b1c0a52f8f01.tar.gz rails-d99dd0af039f73039edce68a4930b1c0a52f8f01.tar.bz2 rails-d99dd0af039f73039edce68a4930b1c0a52f8f01.zip | |
Require action_view explicitly in AC::Base
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.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/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index fce61cddfd..2580a78c7d 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -1,5 +1,6 @@ require 'active_support/concern' require 'active_support/core_ext/class/attribute' +require 'action_view/view_paths' require 'set' module AbstractController diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 85f0f50807..c0f10da23a 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1,3 +1,4 @@ +require 'action_view' require "action_controller/log_subscriber" require "action_controller/metal/params_wrapper" |