diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-11 02:15:00 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-07-11 02:16:57 -0700 |
| commit | 00aae7cb38a9d7029b1530bcf21a89ead80130a4 (patch) | |
| tree | 116228df0d918f53ae43e6eb62959cf232a4d241 /activerecord | |
| parent | e22e1c0b282f86901500da8bdb70c9d711e16066 (diff) | |
| download | rails-00aae7cb38a9d7029b1530bcf21a89ead80130a4.tar.gz rails-00aae7cb38a9d7029b1530bcf21a89ead80130a4.tar.bz2 rails-00aae7cb38a9d7029b1530bcf21a89ead80130a4.zip | |
Synced 4.2 release notes with the latest commits.
Also reordered some of the items to put newer ones on top (same order as
CHANGELOGs), which makes it easier to diff while we are still working on it.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 971bef913f..d229254da4 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -871,7 +871,7 @@ *Vilius Luneckas* *Ahmed AbouElhamayed* * `before_add` callbacks are fired before the record is saved on - `has_and_belongs_to_many` assocations *and* on `has_many :through` + `has_and_belongs_to_many` associations *and* on `has_many :through` associations. Before this change, `before_add` callbacks would be fired before the record was saved on `has_and_belongs_to_many` associations, but *not* on `has_many :through` associations. |