Skip to content
Browse files

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

Require action_view to fix missing constant ENCODING_FLAG
  • Loading branch information...
2 parents 2248684 + 47860b6 commit 9da2ae11cb8782869ecc0422803b090268e223ee @senny senny committed Feb 7, 2014
Showing with 6 additions and 0 deletions.
  1. +5 −0 actionpack/CHANGELOG.md
  2. +1 −0 actionpack/lib/abstract_controller/rendering.rb
View
5 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`.
View
1 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'

0 comments on commit 9da2ae1

Please sign in to comment.
Something went wrong with that request. Please try again.