This project is archived and is in readonly mode.

Changeset [99f2cb4918786382413bdd29b3cacfd5b9377677] by Jeremy Kemper

December 3rd, 2008 @ 04:32 PM

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

Committed by Jeremy Kemper

  • M actionmailer/lib/action_mailer/base.rb
  • M actionmailer/test/asset_host_test.rb
  • M actionmailer/test/fixtures/asset_host_mailer/email_with_asset.html.erb
  • M actionpack/CHANGELOG
  • M actionpack/lib/action_controller.rb
  • M actionpack/lib/action_controller/base.rb
  • M actionpack/lib/action_controller/dispatcher.rb
  • M actionpack/lib/action_controller/middleware_stack.rb
  • M actionpack/lib/action_controller/request.rb
  • M actionpack/lib/action_view/helpers/asset_tag_helper.rb
  • M actionpack/lib/action_view/helpers/text_helper.rb
  • M actionpack/test/controller/request_test.rb
  • M actionpack/test/template/text_helper_test.rb
  • M activerecord/CHANGELOG
  • M activerecord/lib/active_record/association_preload.rb
  • M activerecord/lib/active_record/associations.rb
  • M activerecord/lib/active_record/associations/association_proxy.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
  • M activerecord/test/cases/associations/has_many_associations_test.rb
  • M activerecord/test/cases/finder_test.rb
  • M activerecord/test/models/author.rb
  • M activerecord/test/models/category.rb
  • M activerecord/test/models/project.rb
  • M activeresource/lib/active_resource/base.rb
  • M railties/CHANGELOG
  • M railties/Rakefile
  • M railties/bin/process/inspector
  • M railties/bin/process/reaper
  • M railties/bin/process/spawner
  • M railties/bin/rails
  • M railties/config.ru
  • M railties/configs/initializers/new_rails_defaults.rb
  • M railties/configs/initializers/session_store.rb
  • M railties/dispatches/config.ru
  • M railties/environments/environment.rb
  • M railties/environments/production.rb
  • M railties/environments/test.rb
  • M railties/helpers/application_controller.rb
  • M railties/lib/commands/process/inspector.rb
  • M railties/lib/commands/process/reaper.rb
  • M railties/lib/commands/process/spawner.rb
  • M railties/lib/commands/process/spinner.rb
  • M railties/lib/commands/server.rb
  • M railties/lib/fcgi_handler.rb
  • M railties/lib/initializer.rb
  • M railties/lib/rails/gem_dependency.rb
  • M railties/lib/rails_generator/base.rb
  • M railties/lib/rails_generator/commands.rb
  • M railties/lib/rails_generator/generators/applications/app/app_generator.rb
  • M railties/lib/rails_generator/generators/applications/app/scm/git.rb
  • M railties/lib/rails_generator/generators/applications/app/scm/scm.rb
  • M railties/lib/rails_generator/generators/applications/app/scm/svn.rb
  • M railties/lib/rails_generator/generators/applications/app/template_runner.rb
  • M railties/lib/tasks/databases.rake
  • M railties/lib/tasks/framework.rake
  • M railties/lib/tasks/middleware.rake
  • M railties/lib/tasks/misc.rake
  • M railties/test/gem_dependency_test.rb
  • M railties/test/initializer_test.rb
  • M railties/test/vendor/gems/dummy-gem-f-1.0.0/.specification
  • M railties/test/vendor/gems/dummy-gem-f-1.0.0/lib/dummy-gem-f.rb
  • M railties/test/vendor/gems/dummy-gem-g-1.0.0/.specification
  • M railties/test/vendor/gems/dummy-gem-g-1.0.0/lib/dummy-gem-g.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>