aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2013-06-08 08:22:29 +0100
committerAndrew White <andyw@pixeltrix.co.uk>2013-06-08 09:45:45 +0100
commitf42e0fd3f4d3e2f4b806b001b6ed88c8da8cd833 (patch)
treec46885fef4c3c9c879f8198f0307402b4a0c4628 /activesupport/CHANGELOG.md
parent20daaf4e2ab30762eeaf023e4870f5a10c34c534 (diff)
downloadrails-f42e0fd3f4d3e2f4b806b001b6ed88c8da8cd833.tar.gz
rails-f42e0fd3f4d3e2f4b806b001b6ed88c8da8cd833.tar.bz2
rails-f42e0fd3f4d3e2f4b806b001b6ed88c8da8cd833.zip
Override Time.at to work with Time-like values
Time.at allows passing a single Time argument which is then converted to an integer. The conversion code since 1.9.3r429 explicitly checks for an instance of Time so we need to override it to allow DateTime and ActiveSupport::TimeWithZone values.
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 7f2acb2f65..d612c644af 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,9 @@
## unreleased ##
+* Override `Time.at` to support the passing of Time-like values when called with a single argument.
+
+ *Andrew White*
+
* Revert the changes on unicode character encoding from `ActiveSupport::JSON.encode`.
This was causing a regression where the resulting string is always returning UTF-8.
Also it changes the behavior of this method on a stable release.