Merge pull request #13232 from strzalek/av-missing-requires

Require action_view explicitly in AC::Base
2013-12-08 06:18:18 -08:00 · 2013-12-08 06:18:18 -08:00 · f86c830981
commit f86c830981
parent 99975e742e d99dd0af03
2 changed files with 2 additions and 0 deletions
--- 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
--- 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"