This project is archived and is in readonly mode.

Changeset [84f1137ef87ff3c8e7cff5e8363d1f116b23fcae] by Carlhuda

December 24th, 2009 @ 03:18 AM

Merge remote branch 'origin/master'

Conflicts:

railties/lib/rails/application.rb

http://github.com/rails/rails/commit/84f1137ef87ff3c8e7cff5e8363d1f...

Committed by Carlhuda

  • M actionpack/lib/action_dispatch/routing/mapper.rb
  • M actionpack/lib/action_dispatch/routing/route_set.rb
  • M actionpack/test/dispatch/routing_test.rb
  • M railties/lib/rails/application.rb
  • M railties/lib/rails/commands/server.rb
  • M railties/lib/rails/generators/rails/app/templates/config.ru
  • M railties/lib/rails/generators/rails/app/templates/script/console.tt
  • M railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt
  • M railties/lib/rails/generators/rails/app/templates/script/server.tt
  • M railties/test/application/configuration_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>