1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/activerecord/test
Joshua Peek 69742ca8fa Merge branch 'master' into active_model
Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb
2009-05-29 16:06:21 -05:00
..
assets move assets and models 2008-01-18 07:27:03 +00:00
cases Merge branch 'master' into active_model 2009-05-29 16:06:21 -05:00
connections Adding AR tests for JDBC connections 2009-01-26 16:08:44 +13:00
fixtures Fixed limited eager loading associations with numbers in the name [#2668 state:resolved] 2009-05-18 13:56:17 +02:00
migrations Made migrations transactional for PostgreSQL [#834 state:resolved] 2008-08-22 14:46:25 -07:00
models Merge branch 'master' into active_model 2009-05-29 16:06:21 -05:00
schema Fixed limited eager loading associations with numbers in the name [#2668 state:resolved] 2009-05-18 13:56:17 +02:00
config.rb Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails 2008-01-21 17:20:51 +00:00