diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 20172f4a28..ab5cdd3b3b 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix invalid test fixture exposed by stricter Ruby 1.8.5 multipart parsing. #6524 [Bob Silva] + * Set ActionView::Base.default_form_builder once rather than passing the :builder option to every form or overriding the form helper methods. [Jeremy Kemper] * Deprecate expire_matched_fragments. Use expire_fragment instead. #6535 [Bob Silva] diff --git a/actionpack/test/fixtures/multipart/binary_file b/actionpack/test/fixtures/multipart/binary_file index 1bcf97f664..7e4c68c62e 100644 Binary files a/actionpack/test/fixtures/multipart/binary_file and b/actionpack/test/fixtures/multipart/binary_file differ