This project is archived and is in readonly mode.
Changeset [ada895e8cac855a2f248aafdb92457365f062d07] by Jeremy Kemper
Revision ada895e8cac855a2f248aafdb92457365f062d07,
committed by Jeremy Kemper
· November 23rd, 2009 @ 11:32 PM
Merge branch 'master' into mail
http://github.com/rails/rails/commit/ada895e8cac855a2f248aafdb92457...
16 changed files
-
A
railties/test/fixtures/vendor/plugins/mspec/lib/rails_generators/mspec_generator.rb -
R
railties/test/fixtures/vendor/plugins/mspec/lib/generators/mspec_generator.rb -
M
Gemfile -
M
actionpack/test/controller/routing_test.rb -
M
activerecord/lib/active_record/associations.rb -
M
activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb -
M
activerecord/test/cases/associations/habtm_join_table_test.rb -
M
activerecord/test/fixtures/edges.yml -
M
activerecord/test/schema/schema.rb -
M
activesupport/lib/active_support/core_ext/logger.rb -
M
activesupport/lib/active_support/notifications.rb -
M
activesupport/test/notifications_test.rb -
M
railties/CHANGELOG -
M
railties/lib/rails/generators.rb -
M
railties/lib/rails/rack/debugger.rb -
M
railties/test/generators_test.rb