aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-22 20:25:20 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-22 20:25:20 -0300
commite0db277be0a57386d299fc0a231b585a612eb9ba (patch)
treef6db29c8479150cdc24150e522f4be4d049a8ba0 /actionpack/CHANGELOG.md
parent2b3ce8627b6b4a401a2e869b22e51cc88d52c49b (diff)
downloadrails-e0db277be0a57386d299fc0a231b585a612eb9ba.tar.gz
rails-e0db277be0a57386d299fc0a231b585a612eb9ba.tar.bz2
rails-e0db277be0a57386d299fc0a231b585a612eb9ba.zip
Fix actionpack CHANGELOG entry
It was included by git on the wrong release
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index fb53e64de7..d29d2747d3 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.14 (Jul 22, 2013) ##
+## unreleased ##
* Fix `ActionDispatch::Assertions::ResponseAssertions#assert_redirected_to`
does not show user-supplied message.
@@ -9,6 +9,9 @@
*Alexey Chernenkov*
+
+## Rails 3.2.14 (Jul 22, 2013) ##
+
* Merge `:action` from routing scope and assign endpoint if both `:controller`
and `:action` are present. The endpoint assignment only occurs if there is
no `:to` present in the options hash so should only affect routes using the