diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-05 11:27:14 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-17 09:25:12 -0200 |
| commit | a5013bb5af299db6bf97f67d4198220280717e80 (patch) | |
| tree | 4c97d6cbf2f285fe5b0be56dd318d9fda32b1707 /actionpack/CHANGELOG.md | |
| parent | d3dcb4b9b26c1ea8b44ee8660af10683cd41e35f (diff) | |
| download | rails-a5013bb5af299db6bf97f67d4198220280717e80.tar.gz rails-a5013bb5af299db6bf97f67d4198220280717e80.tar.bz2 rails-a5013bb5af299db6bf97f67d4198220280717e80.zip | |
Merge pull request #5288 from lest/patch-2
force response body to be read in assert_template
Conflicts:
actionpack/lib/action_controller/test_case.rb
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 42eced7a37..8cf9959831 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,11 @@ ## Rails 3.2.12 (unreleased) ## +* Fix `assert_template` with `render :stream => true`. + Fix #1743. + Backport #5288. + + *Sergey Nartimov* + * Eagerly populate the http method loookup cache so local project inflections do not interfere with use of underscore method ( and we don't need locks ) |