From e0db277be0a57386d299fc0a231b585a612eb9ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 22 Jul 2013 20:25:20 -0300 Subject: Fix actionpack CHANGELOG entry It was included by git on the wrong release --- actionpack/CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'actionpack') 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 -- cgit v1.2.3