diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-16 16:59:04 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-16 16:59:04 -0300 |
| commit | cfd7f4e9a09df137f1e78ae7194e969e4bacfd87 (patch) | |
| tree | 633ea06abec347363d73548163f9fe8f83531a2f /activemodel/CHANGELOG.md | |
| parent | 2a42b12d3b2ccfbdd14893cbc73f78ab229a34c2 (diff) | |
| parent | 2e4f7986b8ec90d7b41c385388be21b8cee79b9c (diff) | |
| download | rails-cfd7f4e9a09df137f1e78ae7194e969e4bacfd87.tar.gz rails-cfd7f4e9a09df137f1e78ae7194e969e4bacfd87.tar.bz2 rails-cfd7f4e9a09df137f1e78ae7194e969e4bacfd87.zip | |
Merge pull request #7024 from bogdan/strict_validation_custom_exception
AM::Validation#validates: custom exception for :strict option
Conflicts:
activemodel/CHANGELOG.md
Diffstat (limited to 'activemodel/CHANGELOG.md')
| -rw-r--r-- | activemodel/CHANGELOG.md | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 12e0956d3c..a8f470397b 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,6 +1,15 @@ ## Rails 4.0.0 (unreleased) ## -* Changed `ActiveModel::Serializers::Xml::Serializer#add_associations` to by default propagate `:skip_types, :dasherize, :camelize` keys to included associations. It can be overriden on each association by explicitly specifying the option on one or more associations *Anthony Alberto* +* `AM::Validation#validates` ability to pass custom exception to `:strict` option. + + *Bogdan Gusiev* + +* Changed `ActiveModel::Serializers::Xml::Serializer#add_associations` to by default + propagate `:skip_types, :dasherize, :camelize` keys to included associations. + It can be overriden on each association by explicitly specifying the option on one + or more associations + + *Anthony Alberto* * Changed `AM::Serializers::JSON.include_root_in_json' default value to false. Now, AM Serializers and AR objects have the same default behaviour. Fixes #6578. |