diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-18 18:18:55 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-18 18:18:55 -0300 |
| commit | a8e7a009d22f787046954b9e043363940deca3da (patch) | |
| tree | a655be653aa484951298c23a0648fd17d41c1cdf /actionpack/CHANGELOG.md | |
| parent | afcd01bf25c0d7742d07b10dd8a465cffef4b9fe (diff) | |
| download | rails-a8e7a009d22f787046954b9e043363940deca3da.tar.gz rails-a8e7a009d22f787046954b9e043363940deca3da.tar.bz2 rails-a8e7a009d22f787046954b9e043363940deca3da.zip | |
Fix changelog conflicts and remove release dates [ci skip]
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 16 |
1 files changed, 5 insertions, 11 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). |