aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2016-06-27 08:36:49 -0700
committerGodfrey Chan <godfreykfc@gmail.com>2016-06-27 08:37:06 -0700
commitffded19faf497c0a0bb392c07f98d9eee62f6925 (patch)
tree8cdc9239dc80e794cbf86903ab6bcc4dafbe902a
parentbdf80369efa5f339531f5c8ace8f52f243e3bc1a (diff)
downloadrails-ffded19faf497c0a0bb392c07f98d9eee62f6925.tar.gz
rails-ffded19faf497c0a0bb392c07f98d9eee62f6925.tar.bz2
rails-ffded19faf497c0a0bb392c07f98d9eee62f6925.zip
Clearify CHANGELOG for #23011 [ci skip]
-rw-r--r--activesupport/CHANGELOG.md8
-rw-r--r--guides/source/5_0_release_notes.md4
2 files changed, 8 insertions, 4 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 01ff1a858d..db439b5732 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,9 @@
-* Fix parsing JSON time in `YYYY-MM-DD hh:mm:ss` (without `Z`).
- Before such time was considered in UTC timezone, now, to comply with standard, it uses local timezone.
+* Support parsing JSON time in ISO8601 local time strings in
+ `ActiveSupport::JSON.decode` when `parse_json_times` is enabled.
+ Strings in the format of `YYYY-MM-DD hh:mm:ss` (without a `Z` at
+ the end) will be parsed in the local timezone (`Time.zone`). In
+ addition, date strings (`YYYY-MM-DD`) are now parsed into `Date`
+ objects.
*Grzegorz Witek*
diff --git a/guides/source/5_0_release_notes.md b/guides/source/5_0_release_notes.md
index c3b5be6170..1eb6f87fd3 100644
--- a/guides/source/5_0_release_notes.md
+++ b/guides/source/5_0_release_notes.md
@@ -969,10 +969,10 @@ Please refer to the [Changelog][active-support] for detailed changes.
* `ActiveSupport::JSON.decode` now supports parsing ISO8601 local times when
`parse_json_times` is enabled.
- ([Pull Request](https://github.com/rails/rails/pull/16917))
+ ([Pull Request](https://github.com/rails/rails/pull/23011))
* `ActiveSupport::JSON.decode` now return `Date` objects for date strings.
- ([Pull Request](https://github.com/rails/rails/pull/16917))
+ ([Pull Request](https://github.com/rails/rails/pull/23011))
* Added ability to `TaggedLogging` to allow loggers to be instantiated multiple
times so that they don't share tags with each other.