- Add tests to protect from regressions in require's return value behavior - See a10606c (require needs to return true or false) for the original bug fix
…ixes #3685. Conflicts: actionpack/CHANGELOG.md Conflicts: actionpack/CHANGELOG.md
…n value of Time.now does nothing
The bug is that an error would be raised while attempting to convert a template from one encoding to another. Please see http://redmine.ruby-lang.org/issues/5564 for more details. The workaround is to load all conversions into memory ahead of time, and will only happen if the ruby version is *exactly* 1.9.3p0. The hope is obviously that the underlying problem will be resolved in the next patchlevel release of 1.9.3. Conflicts: actionpack/CHANGELOG.md
…_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7. Cherry-pick from 3-1-stable: b8d4692 Conflicts: activerecord/test/cases/fixtures_test.rb
…rgumentError: wrong number of arguments (1 for 0) to be thrown at actionpack-3.0.10/lib/action_controller/railtie.rb:54.