1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

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

Require action_view to fix missing constant ENCODING_FLAG
This commit is contained in:
Yves Senn 2014-02-07 18:41:49 +01:00
commit 9da2ae11cb
2 changed files with 6 additions and 0 deletions

View file

@ -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 file

@ -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'