diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-09 10:29:55 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-09 10:29:55 -0300 |
| commit | 103b282130dd340143654801430aed787da4c9c6 (patch) | |
| tree | eddbe800d02f1a3c23f6266b808e74656af31f82 /activesupport/CHANGELOG | |
| parent | fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90 (diff) | |
| parent | a94e7d7897a300a95d5d5a00c5efc573b42bcb58 (diff) | |
| download | rails-103b282130dd340143654801430aed787da4c9c6.tar.gz rails-103b282130dd340143654801430aed787da4c9c6.tar.bz2 rails-103b282130dd340143654801430aed787da4c9c6.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activesupport/CHANGELOG')
| -rw-r--r-- | activesupport/CHANGELOG | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 27d26b2ba5..9c5803c52a 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,11 @@ *Edge* +* JSON: +Object#to_json+ calls +as_json+ to coerce itself into something natively encodable like +Hash+, +Integer+, or +String+. Override +as_json+ instead of +to_json+ so you're JSON library agnostic. [Jeremy Kemper] + +* String #to_time and #to_datetime: handle fractional seconds #864 [Jason Frey] + +* Update bundled TZInfo to v0.3.13 [Geoff Buesing] + * Allow MemCacheStore to be initialized with a MemCache-like object instead of addresses and options [Bryan Helmkamp] * Change spelling of Kyev timezone to Kyiv #2613 [Alexander Dymo] |