diff options
| -rw-r--r-- | actionpack/CHANGELOG.md | 8 | ||||
| -rw-r--r-- | activesupport/CHANGELOG.md | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 745489a270..a953a78417 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,12 +1,12 @@ ## Rails 4.0.0 (unreleased) ## -* Fix that CSRF protection and current_url? helper work with HEAD requests - now ActionDispatch::Head has been removed in favor of Rack::Head. +* Fix CSRF protection and `current_url?` helper to work with HEAD requests + now that `ActionDispatch::Head` has been removed in favor of `Rack::Head`. *Michiel Sikkes* -* Change asset_path to not include `SCRIPT_NAME` when it's used - from a mounted engine (fixes #8119). +* Change `asset_path` to not include `SCRIPT_NAME` when it's used + from a mounted engine. Fixes #8119. *Piotr Sarnacki* diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 7c414efd5b..a2e6c62c3e 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 4.0.0 (unreleased) ## +* Improve `String#squish` to handle Unicode whitespace. *Antoine Lyset* + * Standardise on `to_time` returning an instance of `Time` in the local system timezone across `String`, `Time`, `Date`, `DateTime` and `ActiveSupport::TimeWithZone`. @@ -399,6 +401,4 @@ * Optimize log subscribers to check log level before doing any processing. *Brian Durand* -* Improve String#squish to handle Unicode whitespace. *Antoine Lyset* - Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/activesupport/CHANGELOG.md) for previous changes. |