diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-02-07 18:41:49 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-02-07 18:41:49 +0100 |
| commit | 9da2ae11cb8782869ecc0422803b090268e223ee (patch) | |
| tree | 20f4ef90e1c2901e399aacf50005f4a827534fdf | |
| parent | 2248684d0b3a47708d1e12eeba5f5df5672c225b (diff) | |
| parent | 47860b62b3c9a915c00fd379b705c545d4c6eb0d (diff) | |
| download | rails-9da2ae11cb8782869ecc0422803b090268e223ee.tar.gz rails-9da2ae11cb8782869ecc0422803b090268e223ee.tar.bz2 rails-9da2ae11cb8782869ecc0422803b090268e223ee.zip | |
Merge pull request #13967 from fphilipe/fix-missing-action-view-const
Require action_view to fix missing constant ENCODING_FLAG
| -rw-r--r-- | actionpack/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index b63fb4a9b6..642b847588 100644 --- 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 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' |