diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-17 12:46:51 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-17 12:46:51 +1100 |
| commit | 6f663addaa7ed40f1133687d7a2be0958bf0c059 (patch) | |
| tree | 7beb7f092c1979d1fd5ea6e7aaaf4f59c2f4abf4 /activesupport/CHANGELOG | |
| parent | 8834b2612b7ddda70ee6a685eb0063d3daa8e63d (diff) | |
| parent | 3e94032227d450d479f511070c51f37f53d0ecc4 (diff) | |
| download | rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.tar.gz rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.tar.bz2 rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport/CHANGELOG')
| -rw-r--r-- | activesupport/CHANGELOG | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 9b0a84678a..87ec6f2a2c 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,8 @@ *Edge* +* Changed the default ActiveSupport.use_standard_json_time_format from false to true and +ActiveSupport.escape_html_entities_in_json from true to false to match previously announced Rails 3 defaults [DHH] + * Added Object#presence that returns the object if it's #present? otherwise returns nil [DHH/Colin Kelley] * Add Enumerable#exclude? to bring parity to Enumerable#include? and avoid if !x.include?/else calls [DHH] |