aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2014-01-05 19:23:53 +0000
committerAndrew White <andyw@pixeltrix.co.uk>2014-01-05 19:23:53 +0000
commita1564d470d688eecd5fd01ee771521764cba4b7b (patch)
treec6cd317e2a3b3787d24f0228971ba4d2c4ef8723 /activesupport
parentffc273577a795bb41068bfc2a1bb575ec51a9712 (diff)
downloadrails-a1564d470d688eecd5fd01ee771521764cba4b7b.tar.gz
rails-a1564d470d688eecd5fd01ee771521764cba4b7b.tar.bz2
rails-a1564d470d688eecd5fd01ee771521764cba4b7b.zip
Add CHANGELOG entry for #10634 [ci skip]
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md17
1 files changed, 17 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 973eaef471..fa9eb0815b 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,20 @@
+* Maintain proleptic gregorian in Time#advance
+
+ `Time#advance` uses `Time#to_date` and `Date#advance` to calculate a new date.
+ The `Date` object returned by `Time#to_date` is constructed with the assumption
+ that the `Time` object represents a proleptic gregorian date, but it is
+ configured to observe the default julian calendar reform date (2299161j)
+ for purposes of calculating month, date and year:
+
+ Time.new(1582, 10, 4).to_date.to_s # => "1582-09-24"
+ Time.new(1582, 10, 4).to_date.gregorian.to_s # => "1582-10-04"
+
+ This patch ensures that when the intermediate `Date` object is advanced
+ to yield a new `Date` object, that the `Time` object for return is contructed
+ with a proleptic gregorian month, date and year.
+
+ *Riley Lynch*
+
* MemCacheStore should only accept a Dalli::Client, or create one.
*arthurnn*