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.

Changeset [7f6779c1d5e4ec7f642839caa7e86320720f77c8] by Jeremy Kemper

Revision 7f6779c1d5e4ec7f642839caa7e86320720f77c8, committed by Jeremy Kemper · April 23rd, 2009 @ 12:53 AM

Merge branch 'master' into cherry

Conflicts:

activesupport/lib/active_support.rb

http://github.com/rails/rails/co...

5 changed files

M actionpack/lib/action_dispatch/middleware/params_parser.rb
M activerecord/lib/active_record/serializers/json_serializer.rb
M activeresource/lib/active_resource/formats/json_format.rb
M activesupport/lib/active_support.rb
M activesupport/test/json/decoding_test.rb