This project is archived and is in readonly mode.

Changeset [20e2140ce7cd6ece8769fb09a7e615e961446b02] by José Valim

July 4th, 2009 @ 07:16 PM

Merge branch 'master' of git://github.com/rails/rails http://github.com/rails/rails/co...

Committed by José Valim

  • M activemodel/lib/active_model.rb
  • M activemodel/lib/active_model/attributes.rb
  • M activemodel/lib/active_model/serializer.rb
  • M activemodel/lib/active_model/serializers/json.rb
  • M activemodel/lib/active_model/serializers/xml.rb
  • M activemodel/test/cases/json_serialization_test.rb
  • M activemodel/test/cases/serializeration/json_serialization_test.rb
  • M activemodel/test/cases/serializeration/xml_serialization_test.rb
  • M activemodel/test/models/contact.rb
  • M activerecord/lib/active_record/serialization.rb
  • M activerecord/lib/active_record/serializers/json_serializer.rb
  • M activerecord/lib/active_record/serializers/xml_serializer.rb

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

<h2 style="font-size: 14px">Tickets have moved to Github</h2>

The new ticket tracker is available at <a href="https://github.com/rails/rails/issues">https://github.com/rails/rails/issues</a>