Merge pull request #13967 from fphilipe/fix-missing-action-view-const

Require action_view to fix missing constant ENCODING_FLAG
rails · Feb 7, 2014 · 9da2ae1 · 9da2ae1
2 parents 2248684 + 47860b6
commit 9da2ae1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Properly require `action_view` in `AbstractController::Rendering` to prevent
+    uninitialized constant error for `ENCODING_FLAG`.
+
+    *Philipe Fatio*
+
 *   Do not discard query parameters that form a hash with the same root key as
     the `wrapper_key` for a request using `wrap_parameters`.
 

diff --git 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'