This project is archived and is in readonly mode.

Changeset [eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3] by Jeremy Kemper

November 15th, 2008 @ 08:21 PM

Merge branch 'master' into testing http://github.com/rails/rails/co...

Committed by Jeremy Kemper

  • M actionmailer/CHANGELOG
  • M actionmailer/Rakefile
  • M actionmailer/lib/action_mailer/base.rb
  • M actionmailer/lib/action_mailer/part_container.rb
  • M actionmailer/lib/action_mailer/version.rb
  • M actionmailer/test/mail_service_test.rb
  • M actionpack/CHANGELOG
  • M actionpack/Rakefile
  • M actionpack/lib/action_controller/base.rb
  • M actionpack/lib/action_controller/mime_type.rb
  • M actionpack/lib/action_controller/polymorphic_routes.rb
  • M actionpack/lib/action_controller/request_forgery_protection.rb
  • M actionpack/lib/action_controller/resources.rb
  • M actionpack/lib/action_controller/test_process.rb
  • M actionpack/lib/action_pack/version.rb
  • M actionpack/lib/action_view/helpers/tag_helper.rb
  • M actionpack/lib/action_view/helpers/text_helper.rb
  • M actionpack/test/controller/mime_type_test.rb
  • M actionpack/test/controller/polymorphic_routes_test.rb
  • M actionpack/test/controller/request_forgery_protection_test.rb
  • M actionpack/test/controller/resources_test.rb
  • M actionpack/test/template/form_tag_helper_test.rb
  • M actionpack/test/template/tag_helper_test.rb
  • M actionpack/test/template/text_helper_test.rb
  • M activerecord/CHANGELOG
  • M activerecord/Rakefile
  • M activerecord/lib/active_record/association_preload.rb
  • M activerecord/lib/active_record/associations/has_one_through_association.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/lib/active_record/calculations.rb
  • M activerecord/lib/active_record/version.rb
  • M activerecord/test/cases/associations/has_one_through_associations_test.rb
  • M activerecord/test/cases/calculations_test.rb
  • M activerecord/test/cases/pooled_connections_test.rb
  • M activerecord/test/fixtures/organizations.yml
  • M activerecord/test/models/member.rb
  • M activerecord/test/models/member_detail.rb
  • M activerecord/test/models/organization.rb
  • M activerecord/test/schema/schema.rb
  • M activeresource/CHANGELOG
  • M activeresource/Rakefile
  • M activeresource/lib/active_resource/version.rb
  • M activesupport/CHANGELOG
  • M activesupport/lib/active_support/option_merger.rb
  • M activesupport/lib/active_support/values/time_zone.rb
  • M activesupport/lib/active_support/version.rb
  • M activesupport/test/option_merger_test.rb
  • M activesupport/test/time_zone_test.rb
  • M railties/CHANGELOG
  • M railties/Rakefile
  • M railties/doc/README_FOR_APP
  • M railties/doc/guides/html/2_2_release_notes.html
  • M railties/doc/guides/html/actioncontroller_basics.html
  • M railties/doc/guides/html/activerecord_validations_callbacks.html
  • M railties/doc/guides/html/caching_with_rails.html
  • M railties/doc/guides/html/command_line.html
  • M railties/doc/guides/html/configuring.html
  • M railties/doc/guides/html/creating_plugins.html
  • M railties/doc/guides/html/debugging_rails_applications.html
  • M railties/doc/guides/html/finders.html
  • M railties/doc/guides/html/getting_started_with_rails.html
  • M railties/doc/guides/html/layouts_and_rendering.html
  • M railties/doc/guides/html/migrations.html
  • M railties/doc/guides/html/routing_outside_in.html
  • M railties/doc/guides/html/testing_rails_applications.html
  • M railties/doc/guides/source/2_2_release_notes.txt
  • M railties/doc/guides/source/actioncontroller_basics/http_auth.txt
  • M railties/doc/guides/source/actioncontroller_basics/methods.txt
  • M railties/doc/guides/source/actioncontroller_basics/params.txt
  • M railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt
  • M railties/doc/guides/source/actioncontroller_basics/session.txt
  • M railties/doc/guides/source/actioncontroller_basics/streaming.txt
  • M railties/doc/guides/source/activerecord_validations_callbacks.txt
  • M railties/doc/guides/source/caching_with_rails.txt
  • M railties/doc/guides/source/command_line.txt
  • M railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt
  • M railties/doc/guides/source/creating_plugins/basics.markdown
  • M railties/doc/guides/source/creating_plugins/controllers.txt
  • M railties/doc/guides/source/creating_plugins/core_ext.txt
  • M railties/doc/guides/source/creating_plugins/custom_generator.txt
  • M railties/doc/guides/source/creating_plugins/custom_route.txt
  • M railties/doc/guides/source/creating_plugins/gem.txt
  • M railties/doc/guides/source/creating_plugins/generator_method.txt
  • M railties/doc/guides/source/creating_plugins/helpers.txt
  • M railties/doc/guides/source/creating_plugins/index.txt
  • M railties/doc/guides/source/creating_plugins/migration_generator.txt
  • M railties/doc/guides/source/creating_plugins/models.txt
  • M railties/doc/guides/source/creating_plugins/odds_and_ends.txt
  • M railties/doc/guides/source/creating_plugins/preparation.txt
  • M railties/doc/guides/source/creating_plugins/string_to_squawk.txt
  • M railties/doc/guides/source/creating_plugins/test_setup.txt
  • M railties/doc/guides/source/creating_plugins/view_helper.txt
  • M railties/doc/guides/source/debugging_rails_applications.txt
  • M railties/doc/guides/source/finders.txt
  • M railties/doc/guides/source/getting_started_with_rails.txt
  • M railties/doc/guides/source/layouts_and_rendering.txt
  • M railties/doc/guides/source/migrations/foreign_keys.txt
  • M railties/doc/guides/source/migrations/scheming.txt
  • M railties/doc/guides/source/routing_outside_in.txt
  • M railties/doc/guides/source/testing_rails_applications.txt
  • M railties/environments/boot.rb
  • M railties/lib/rails/vendor_gem_source_index.rb
  • M railties/lib/rails/version.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>