diff options
| -rw-r--r-- | actionpack/CHANGELOG.md | 16 | ||||
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activesupport/CHANGELOG.md | 2 |
3 files changed, 8 insertions, 14 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 79ee22921c..2104018106 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -4,7 +4,11 @@ Fixes GH#3512. *Juan Barreneche* -* No changes. + +* Fix `ActionDispatch::Request#formats` when the Accept request-header is an + empty string. Fix #7774 [Backport #8977, #9541] + + *Soylent + Maxime Réty* ## Rails 3.2.13 ## @@ -26,16 +30,6 @@ *Olek Janiszewski* -<<<<<<< HEAD -* Fix `ActionDispatch::Request#formats` when the Accept request-header is an - empty string. Fix #7774 [Backport #8977, #9541] - - *Soylent + Maxime Réty* - -## Rails 3.2.13.rc1 (Feb 17, 2013) ## - -======= ->>>>>>> 3-2-13 * Determine the controller#action from only the matched path when using the shorthand syntax. Previously the complete path was used, which led to problems with nesting (scopes and namespaces). diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 43c1a4565f..f9c55ba0f4 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.13 (Feb 17, 2013) ## +## unrelesed ## * Reload the association target if it's stale. `@stale_state` should be nil when a model isn't saved. @@ -13,7 +13,7 @@ *kennyj* -## Rails 3.2.13.rc1 (Feb 17, 2013) ## +## Rails 3.2.13 ## * Reverted 921a296a3390192a71abeec6d9a035cc6d1865c8, 'Quote numeric values compared to string columns.' This caused several regressions. diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index f15d906f1f..a22daa1d5f 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -6,7 +6,7 @@ *Andrew White* -## Rails 3.2.13 (Feb 17, 2013) ## +## Rails 3.2.13 ## * Fix DateTime comparison with DateTime::Infinity object. |