diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-25 14:29:34 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-25 22:55:20 -0200 |
| commit | 6fe1a4a2da5440aee91c4de387ffdf71b0b83a0e (patch) | |
| tree | 7c648455a52abc85382753b8de456660993076c9 /activerecord/CHANGELOG.md | |
| parent | 83e71051258b98bd5c4df80b321c7b690ddcab35 (diff) | |
| download | rails-6fe1a4a2da5440aee91c4de387ffdf71b0b83a0e.tar.gz rails-6fe1a4a2da5440aee91c4de387ffdf71b0b83a0e.tar.bz2 rails-6fe1a4a2da5440aee91c4de387ffdf71b0b83a0e.zip | |
Merge pull request #8311 from alisdair/dirty-nullable-datetime
Don't call will_change! for datetime nil->"".
Setting a nil datetime attribute to a blank string should not cause the
attribute to be dirty.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 78346d8586..4a445529b5 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,11 @@ ## Rails 3.2.10 (unreleased) +* Fix dirty attribute checks for TimeZoneConversion with nil and blank + datetime attributes. Setting a nil datetime to a blank string should not + result in a change being flagged. Fix #8310 [Backport #8311] + + *Alisdair McDiarmid* + * Prevent mass assignment to the type column of polymorphic associations when using `build` [Backport #8291] Fix #8265 |