This project is archived and is in readonly mode.
Changeset [3075ae0611625657de052a2ad93cf083d24bb803] by José Valim
July 12th, 2009 @ 03:29 PM
Solving merge conflicts. http://github.com/rails/rails/co...
Committed by José Valim
- M activemodel/lib/active_model/serializers/xml.rb
- M activerecord/lib/active_record/attribute_methods.rb
- M activerecord/lib/active_record/serializers/xml_serializer.rb
- M activerecord/test/cases/attribute_methods_test.rb
- M activeresource/lib/active_resource/base.rb
- M activeresource/test/observing_test.rb
- M railties/lib/generators/erb/scaffold/templates/index.html.erb
- M railties/lib/generators/erb/scaffold/templates/layout.html.erb
- M railties/lib/generators/rails/app/templates/public/404.html
- M railties/lib/generators/rails/app/templates/public/422.html
- M railties/lib/generators/rails/app/templates/public/500.html
- M railties/lib/generators/rails/app/templates/public/index.html
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>