This project is archived and is in readonly mode.

Changeset [7f6779c1d5e4ec7f642839caa7e86320720f77c8] 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...

Committed by Jeremy Kemper

  • 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

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>