diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-14 08:47:42 -0800 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2012-09-21 15:36:23 +0300 |
| commit | b8fba557e139830cbc180bc11dbf92990f53edc5 (patch) | |
| tree | e2a8c1966ef8650d609c0740e67d67ed5a444386 /activerecord/CHANGELOG.md | |
| parent | 98f80218d4a588bd4bcace2ae534b9a791d381f9 (diff) | |
| download | rails-b8fba557e139830cbc180bc11dbf92990f53edc5.tar.gz rails-b8fba557e139830cbc180bc11dbf92990f53edc5.tar.bz2 rails-b8fba557e139830cbc180bc11dbf92990f53edc5.zip | |
Merge pull request #3544 from amatsuda/_field_changed
Rename field_changed? to _field_changed? so that users can create a field named field
Conflicts:
activerecord/lib/active_record/core.rb
activerecord/test/cases/dirty_test.rb
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index b3c1b034d7..589c3d71b0 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,9 @@ ## Rails 3.2.9 (unreleased) +* Rename field_changed? to _field_changed? so that users can create a field named field + + *Akira Matsuda*, backported by *Steve Klabnik* + * Fix creation of through association models when using `collection=[]` on a `has_many :through` association from an unsaved model. Fix #7661. |