This project is archived and is in readonly mode.

Changeset [4e96442c4e404141830b2d7f0d850b6556190b39] by José Valim and Mikel Lindsaar

January 24th, 2010 @ 10:50 PM

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

Conflicts:

actionmailer/lib/action_mailer/mail_helper.rb
railties/lib/rails/configuration.rb

http://github.com/rails/rails/commit/4e96442c4e404141830b2d7f0d850b...

Committed by José Valim and Mikel Lindsaar

  • A activesupport/lib/active_support/railtie.rb
  • A railties/lib/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt
  • A railties/lib/rails/application/bootstrap.rb
  • A railties/lib/rails/application/configuration.rb
  • A railties/lib/rails/application/finisher.rb
  • A railties/lib/rails/application/railties.rb
  • A railties/lib/rails/application/routes_reloader.rb
  • A railties/lib/rails/console/app.rb
  • A railties/lib/rails/console/helpers.rb
  • A railties/lib/rails/console/sandbox.rb
  • A railties/lib/rails/engine.rb
  • A railties/lib/rails/engine/configurable.rb
  • A railties/lib/rails/engine/configuration.rb
  • A railties/lib/rails/railtie/configurable.rb
  • A railties/lib/rails/railtie/configuration.rb
  • R railties/lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt
  • R railties/lib/rails/bootstrap.rb
  • R railties/lib/rails/console_app.rb
  • R railties/lib/rails/console_sandbox.rb
  • R railties/lib/rails/console_with_helpers.rb
  • R railties/test/initializer/initialize_i18n_test.rb
  • M actionmailer/lib/action_mailer/railtie.rb
  • M actionpack/lib/action_controller/base.rb
  • M actionpack/lib/action_controller/metal/helpers.rb
  • M actionpack/lib/action_controller/railtie.rb
  • M actionpack/lib/action_dispatch/middleware/callbacks.rb
  • M actionpack/lib/action_dispatch/railtie.rb
  • M actionpack/lib/action_dispatch/routing/route_set.rb
  • M actionpack/lib/action_view/railtie.rb
  • M actionpack/test/abstract/helper_test.rb
  • M actionpack/test/controller/helper_test.rb
  • M actionpack/test/fixtures/helpers/fun/games_helper.rb
  • M actionpack/test/fixtures/helpers/fun/pdf_helper.rb
  • M activerecord/lib/active_record/railtie.rb
  • M activeresource/lib/active_resource/railtie.rb
  • M railties/lib/generators/rails/app/templates/Rakefile
  • M railties/lib/generators/rails/app/templates/config/boot.rb
  • M railties/lib/generators/rails/app/templates/script/console.tt
  • M railties/lib/generators/rails/app/templates/script/dbconsole.tt
  • M railties/lib/generators/rails/metal/templates/metal.rb
  • M railties/lib/generators/rails/plugin/plugin_generator.rb
  • M railties/lib/rails.rb
  • M railties/lib/rails/all.rb
  • M railties/lib/rails/application.rb
  • M railties/lib/rails/commands/console.rb
  • M railties/lib/rails/configuration.rb
  • M railties/lib/rails/initializable.rb
  • M railties/lib/rails/paths.rb
  • M railties/lib/rails/plugin.rb
  • M railties/lib/rails/rack/metal.rb
  • M railties/lib/rails/railtie.rb
  • M railties/lib/rails/tasks/documentation.rake
  • M railties/lib/rails/tasks/middleware.rake
  • M railties/lib/rails/tasks/routes.rake
  • M railties/test/application/console_test.rb
  • M railties/test/application/initializer_test.rb
  • M railties/test/application/notifications_test.rb
  • M railties/test/generators/plugin_generator_test.rb
  • M railties/test/initializable_test.rb
  • M railties/test/initializer/path_test.rb
  • M railties/test/paths_test.rb
  • M railties/test/plugins/configuration_test.rb
  • M railties/test/plugins/vendored_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>