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 /activemodel/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 'activemodel/CHANGELOG')
-rw-r--r-- | activemodel/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG index 26500568ee..7489c0daa5 100644 --- a/activemodel/CHANGELOG +++ b/activemodel/CHANGELOG @@ -1,5 +1,7 @@ *Edge* +* Change the ActiveModel::Base.include_root_in_json default to true for Rails 3 [DHH] + * Add validates_format_of :without => /regexp/ option. #430 [Elliot Winkler, Peer Allan] Example : |