aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-28 13:28:50 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-28 13:28:50 -0800
commitfae2e4d05d122e2d711a90c0a46dfb4b42dbadc3 (patch)
treed1e66590ae67a5ca306613609bad4c513edfcfbb /actionpack/CHANGELOG.md
parentdc53fe92404910a83cfc056d126f45772dfa58fe (diff)
parent371a5f2d73f73243ec2440305fdfab64088f35a3 (diff)
downloadrails-fae2e4d05d122e2d711a90c0a46dfb4b42dbadc3.tar.gz
rails-fae2e4d05d122e2d711a90c0a46dfb4b42dbadc3.tar.bz2
rails-fae2e4d05d122e2d711a90c0a46dfb4b42dbadc3.zip
Merge pull request #9366 from killthekitten/fix-content_for-regression
Fix for #9360 content_for regression
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 180d802dbe..c45e14abf7 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1041,4 +1041,6 @@
* `ActionView::Helpers::TextHelper#highlight` now defaults to the
HTML5 `mark` element. *Brian Cardarella*
+* Fixed `ActionView::Helpers::CaptureHelper#content_for` regression (described in #9360). *Nikolay Shebanov*
+
Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/actionpack/CHANGELOG.md) for previous changes.