This project is archived and is in readonly mode.

Changeset [8b37fee201bb3f41d3bc4557422c5f8b344f456c] by Mikel Lindsaar

January 20th, 2010 @ 10:58 AM

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

Conflicts:

actionmailer/lib/action_mailer/base.rb

http://github.com/rails/rails/commit/8b37fee201bb3f41d3bc4557422c5f...

Committed by Mikel Lindsaar

  • A activerecord/lib/active_record/relation/calculations.rb
  • R activerecord/lib/active_record/calculations.rb
  • R activerecord/lib/active_record/relation/calculation_methods.rb
  • M actionmailer/lib/action_mailer/base.rb
  • M actionmailer/lib/action_mailer/railties/subscriber.rb
  • M actionmailer/lib/action_mailer/test_case.rb
  • M actionpack/lib/action_controller/base.rb
  • M actionpack/lib/action_controller/metal/filter_parameter_logging.rb
  • M actionpack/lib/action_controller/metal/helpers.rb
  • M actionpack/lib/action_controller/metal/instrumentation.rb
  • M actionpack/lib/action_controller/railties/subscriber.rb
  • M actionpack/lib/action_dispatch/middleware/notifications.rb
  • M actionpack/lib/action_dispatch/middleware/params_parser.rb
  • M actionpack/lib/action_dispatch/middleware/stack.rb
  • M actionpack/lib/action_dispatch/railties/subscriber.rb
  • M actionpack/lib/action_dispatch/routing/mapper.rb
  • M actionpack/lib/action_dispatch/testing/integration.rb
  • M actionpack/test/activerecord/controller_runtime_test.rb
  • M actionpack/test/controller/new_base/base_test.rb
  • M actionpack/test/controller/subscriber_test.rb
  • M actionpack/test/dispatch/request/json_params_parsing_test.rb
  • M actionpack/test/dispatch/request/xml_params_parsing_test.rb
  • M actionpack/test/dispatch/show_exceptions_test.rb
  • M actionpack/test/dispatch/subscriber_test.rb
  • M activemodel/lib/active_model/lint.rb
  • M activerecord/lib/active_record.rb
  • M activerecord/lib/active_record/association_preload.rb
  • M activerecord/lib/active_record/associations.rb
  • M activerecord/lib/active_record/associations/association_collection.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/lib/active_record/locking/optimistic.rb
  • M activerecord/lib/active_record/named_scope.rb
  • M activerecord/lib/active_record/relation.rb
  • M activerecord/lib/active_record/relation/finder_methods.rb
  • M activerecord/lib/active_record/relation/query_methods.rb
  • M activerecord/lib/active_record/relation/spawn_methods.rb
  • M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
  • M activerecord/test/cases/method_scoping_test.rb
  • M activerecord/test/cases/named_scope_test.rb
  • M activesupport/lib/active_support/core_ext/load_error.rb
  • M activesupport/lib/active_support/dependencies.rb
  • M activesupport/lib/active_support/values/time_zone.rb
  • M activesupport/test/core_ext/load_error_test.rb
  • M activesupport/test/time_zone_test.rb
  • M railties/builtin/rails_info/rails/info.rb
  • M railties/lib/rails/application.rb
  • M railties/lib/rails/generators.rb
  • M railties/lib/rails/plugin.rb
  • M railties/lib/rails/railtie.rb
  • M railties/lib/rails/subscriber.rb
  • M railties/lib/rails/tasks/middleware.rake
  • M railties/test/generators_test.rb
  • M railties/test/plugins/framework_extension_test.rb
  • M railties/test/subscriber_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>