diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-28 12:53:48 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-29 13:41:38 -0200 |
| commit | e8c360527d22b6299d28e5b6784c4af74537eef2 (patch) | |
| tree | a0e5573da44872e3d996f58512e4c8d0a123a1e4 /activemodel/CHANGELOG.md | |
| parent | 66e87b714b406a25af60156a1fa15d1ebb99a0bd (diff) | |
| download | rails-e8c360527d22b6299d28e5b6784c4af74537eef2.tar.gz rails-e8c360527d22b6299d28e5b6784c4af74537eef2.tar.bz2 rails-e8c360527d22b6299d28e5b6784c4af74537eef2.zip | |
Merge pull request #8352 from steveklabnik/update_7858
Specify type of singular assication during serialization
Conflicts:
activemodel/CHANGELOG.md
activemodel/test/cases/serializers/xml_serialization_test.rb
Diffstat (limited to 'activemodel/CHANGELOG.md')
| -rw-r--r-- | activemodel/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 4882421014..d98df4cb91 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 3.2.10 (unreleased) ## + +* Specify type of singular association during serialization *Steve Klabnik* + + ## Rails 3.2.9 (Nov 12, 2012) ## * Due to a change in builder, nil values and empty strings now generates |