diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-03-30 20:56:05 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-03-30 20:56:05 -0500 |
| commit | 5df076ad0965dc684afff8a019fd9f92a53ada76 (patch) | |
| tree | b2272d3d7f0ed6713d888390a13b130c65aec6f3 /activerecord/CHANGELOG | |
| parent | ac9443ed71bf0b40cf5b321e8e1b77b98abd9b5e (diff) | |
| parent | 9772de8d459960cc114c5b214343b7ce08fea21c (diff) | |
| download | rails-5df076ad0965dc684afff8a019fd9f92a53ada76.tar.gz rails-5df076ad0965dc684afff8a019fd9f92a53ada76.tar.bz2 rails-5df076ad0965dc684afff8a019fd9f92a53ada76.zip | |
Merge branch 'master' into sprockets
Diffstat (limited to 'activerecord/CHANGELOG')
| -rw-r--r-- | activerecord/CHANGELOG | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 8b4e9a34cb..6be46349fb 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,11 @@ *Rails 3.1.0 (unreleased)* +* Associations with a :through option can now use *any* association as the + through or source association, including other associations which have a + :through option and has_and_belongs_to_many associations + + [Jon Leighton] + * The configuration for the current database connection is now accessible via ActiveRecord::Base.connection_config. [fxn] |