aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
diff options
context:
space:
mode:
authorPhilipe Fatio <me@phili.pe>2014-02-07 11:06:55 +0100
committerPhilipe Fatio <me@phili.pe>2014-02-07 17:48:18 +0100
commit47860b62b3c9a915c00fd379b705c545d4c6eb0d (patch)
tree2e0caafd1de9661cc7ac9ae37fa4be20264ad291 /actionpack/lib/abstract_controller
parente3d81945826083756de383612c3afbbdda8e1392 (diff)
downloadrails-47860b62b3c9a915c00fd379b705c545d4c6eb0d.tar.gz
rails-47860b62b3c9a915c00fd379b705c545d4c6eb0d.tar.bz2
rails-47860b62b3c9a915c00fd379b705c545d4c6eb0d.zip
Require action_view to fix missing constant
Previously, requiring action_view/view_paths did cause an uninitialized constant error for ENCODING_FLAG, which is defined in action_view.
Diffstat (limited to 'actionpack/lib/abstract_controller')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 7be61d94c9..f24b03ad16 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'
require 'action_view/view_paths'
require 'set'