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 [84f1137ef87ff3c8e7cff5e8363d1f116b23fcae] by Carlhuda

Revision 84f1137ef87ff3c8e7cff5e8363d1f116b23fcae, committed 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...

10 changed files

  • 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