Hongli Lai (Phusion) ccb96f2297 Merge commit 'origin/master' into savepoints ...

Conflicts:
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/defaults_test.rb

2008-12-03 19:30:35 +01:00

..

assets

move assets and models

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

cases

Merge commit 'origin/master' into savepoints

2008-12-03 19:30:35 +01:00

connections

Consistently use the framework's configured logger and avoid reverting to RAILS_DEFAULT_LOGGER unless necessary.

2008-08-18 23:36:13 -05:00

fixtures

fix assignment to has_one :through associations.

2008-11-15 18:20:39 +01:00

migrations

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

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

models

Add :having option to find, to use in combination with grouped finds. Also added to has_many and has_and_belongs_to_many associations.

2008-12-01 20:22:31 +01:00

schema

Remove SQL Server cases from tests for latest adapter work to pass rails expected behavior.

2008-11-19 18:00:56 +01:00

config.rb

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

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