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 [1de95077dc3bfc7589ca85dc31d46a1ea6db7650] by Joshua Peek

Revision 1de95077dc3bfc7589ca85dc31d46a1ea6db7650, committed by Joshua Peek · December 22nd, 2009 @ 02:41 AM

Merge branch 'master' of github.com:rails/rails

Conflicts:

railties/test/initializer/initialize_i18n_test.rb
railties/test/initializer/path_test.rb

http://github.com/rails/rails/commit/1de95077dc3bfc7589ca85dc31d46a...

21 changed files

  • A railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
  • A railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
  • A railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
  • R railties/lib/rails/generators/rails/app/templates/config/environments/development.rb
  • R railties/lib/rails/generators/rails/app/templates/config/environments/production.rb
  • R railties/lib/rails/generators/rails/app/templates/config/environments/test.rb
  • M actionmailer/lib/action_mailer/base.rb
  • M actionpack/lib/abstract_controller/rendering.rb
  • M actionpack/lib/action_view/render/rendering.rb
  • M railties/lib/rails/application.rb
  • M railties/lib/rails/generators/rails/app/app_generator.rb
  • M railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb
  • M railties/lib/rails/generators/rails/app/templates/config/application.rb
  • M railties/lib/rails/generators/rails/app/templates/config/routes.rb
  • M railties/test/application/configuration_test.rb
  • M railties/test/application/initializer_test.rb
  • M railties/test/application/routing_test.rb
  • M railties/test/initializer/initialize_i18n_test.rb
  • M railties/test/initializer/path_test.rb
  • M railties/test/isolation/abstract_unit.rb
  • M railties/test/plugins/configuration_test.rb