This project is archived and is in readonly mode.
Changeset [71f7e75d95c47e4283a7cac0a2f776abf0a11d0e] by Jeremy Kemper
Revision 71f7e75d95c47e4283a7cac0a2f776abf0a11d0e,
committed by Jeremy Kemper
· October 16th, 2009 @ 01:36 AM
Merge branch 'master' into orchestra
http://github.com/rails/rails/commit/71f7e75d95c47e4283a7cac0a2f776...
42 changed files
-
A
railties/lib/rails/generators/rails/app/templates/config/application.rb -
M
actionmailer/test/abstract_unit.rb -
M
actionpack/Gemfile -
M
actionpack/lib/action_view/base.rb -
M
actionpack/test/abstract_unit.rb -
M
actionpack/test/controller/new_base/content_negotiation_test.rb -
M
actionpack/test/controller/new_base/metal_test.rb -
M
actionpack/test/controller/rescue_test.rb -
M
actionpack/test/dispatch/test_request_test.rb -
M
railties/lib/rails/commands/about.rb -
M
railties/lib/rails/commands/destroy.rb -
M
railties/lib/rails/commands/generate.rb -
M
railties/lib/rails/commands/performance/benchmarker.rb -
M
railties/lib/rails/commands/performance/profiler.rb -
M
railties/lib/rails/commands/runner.rb -
M
railties/lib/rails/commands/update.rb -
M
railties/lib/rails/generators/actions.rb -
M
railties/lib/rails/generators/rails/app/app_generator.rb -
M
railties/lib/rails/generators/rails/app/templates/Rakefile -
M
railties/lib/rails/generators/rails/app/templates/config.ru -
M
railties/lib/rails/generators/rails/app/templates/config/environment.rb -
M
railties/lib/rails/generators/rails/app/templates/script/about.tt -
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/destroy.tt -
M
railties/lib/rails/generators/rails/app/templates/script/generate.tt -
M
railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt -
M
railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt -
M
railties/lib/rails/generators/rails/app/templates/script/plugin.tt -
M
railties/lib/rails/generators/rails/app/templates/script/runner.tt -
M
railties/lib/rails/generators/rails/app/templates/script/server.tt -
M
railties/lib/rails/initializer.rb -
M
railties/test/abstract_unit.rb -
M
railties/test/application/generators_test.rb -
M
railties/test/application/initializer_test.rb -
M
railties/test/application/plugins_test.rb -
M
railties/test/generators/actions_test.rb -
M
railties/test/generators/app_generator_test.rb -
M
railties/test/initializer/check_ruby_version_test.rb -
M
railties/test/initializer/initialize_i18n_test.rb -
M
railties/test/initializer/path_test.rb -
M
railties/test/isolation/abstract_unit.rb