This project is archived and is in readonly mode.

Changeset [b6bac73b282c7e500c43810f2a937fc0047e5979] by Yehuda Katz + Carl Lerche

May 15th, 2009 @ 01:38 AM

Merge commit 'origin/master'

Conflicts:

actionpack/lib/action_controller/abstract/base.rb
actionpack/lib/action_controller/routing.rb

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

Committed by Yehuda Katz + Carl Lerche

  • M actionpack/examples/minimal.rb
  • M actionpack/lib/action_controller/abstract/base.rb
  • M actionpack/lib/action_controller/abstract/logger.rb
  • M actionpack/lib/action_controller/new_base/http.rb
  • M actionpack/lib/action_controller/routing.rb
  • M actionpack/lib/action_dispatch/http/status_codes.rb
  • M actionpack/test/activerecord/polymorphic_routes_test.rb
  • M activerecord/lib/active_record/attribute_methods.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/test/cases/finder_test.rb
  • M activesupport/lib/active_support/memoizable.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>