Emilio Tagua 39e4e76d15 Merge commit 'rails/master' ...

Conflicts:
	activerecord/lib/active_record/associations.rb

2009-09-01 15:45:43 -03:00

..

assets

move assets and models

2008-01-18 07:27:03 +00:00

cases

Merge commit 'rails/master'

2009-09-01 15:45:43 -03:00

connections

Remove support for SQLite 2.

2009-08-17 14:54:34 +01:00

fixtures

Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted.

2009-09-01 10:15:23 -07:00

migrations

Made migrations transactional for PostgreSQL [#834 state:resolved]

2008-08-22 14:46:25 -07:00

models

has_many :through create should not raise validation errors

2009-08-09 18:44:45 -07:00

schema

Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted.

2009-09-01 10:15:23 -07:00

config.rb

Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails

2008-01-21 17:20:51 +00:00