diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-28 17:18:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 17:18:48 -0400 |
| commit | f1a6b52a4dbf936b8f78f6574510ed2b9774ecc6 (patch) | |
| tree | 4b4e0f373ee661587923f2c79b28f50a07e3db9e /activerecord/lib/active_record/timestamp.rb | |
| parent | b04082100f58f855b1825430b3e3685a24ae63f3 (diff) | |
| parent | 41f6347c5b4923b71360ea19f860ef77f5c91d77 (diff) | |
| download | rails-f1a6b52a4dbf936b8f78f6574510ed2b9774ecc6.tar.gz rails-f1a6b52a4dbf936b8f78f6574510ed2b9774ecc6.tar.bz2 rails-f1a6b52a4dbf936b8f78f6574510ed2b9774ecc6.zip | |
Merge pull request #29076 from kamipo/use_timestamp_attributes_for_update_in_model
Use `timestamp_attributes_for_update_in_model` rather than `timestamp_attributes_for_update`
Diffstat (limited to 'activerecord/lib/active_record/timestamp.rb')
| -rw-r--r-- | activerecord/lib/active_record/timestamp.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb index 55f3a194a9..dc4540eea6 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -126,7 +126,7 @@ module ActiveRecord self.class.send(:current_time_from_proper_timezone) end - def max_updated_column_timestamp(timestamp_names = self.class.send(:timestamp_attributes_for_update)) + def max_updated_column_timestamp(timestamp_names = timestamp_attributes_for_update_in_model) timestamp_names .map { |attr| self[attr] } .compact |