Lighthouse has a new layout. Prefer the old one? Return to the old layout, and switch back any time from the link at the top of each page.

This project is archived and is in readonly mode.

All changesets

Changeset [3075ae0611625657de052a2ad93cf083d24bb803] by José Valim

Revision 3075ae0611625657de052a2ad93cf083d24bb803, committed by José Valim · July 12th, 2009 @ 03:29 PM

Solving merge conflicts. http://github.com/rails/rails/co...

12 changed files

  • 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