diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2014-12-27 21:44:30 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2014-12-27 21:44:30 -0700 |
| commit | 3ba552fb2900ce67409af57f3c7a1f9fda4c10d3 (patch) | |
| tree | fa3db96769d699bc7bdb4623d727c7302b0d6159 /activerecord/lib/active_record/timestamp.rb | |
| parent | 307ec3db0fe26cbd1811d34a27e6637726ce23ce (diff) | |
| parent | e780e2fda326fa5ea616e1441a6ed81b2890085c (diff) | |
| download | rails-3ba552fb2900ce67409af57f3c7a1f9fda4c10d3.tar.gz rails-3ba552fb2900ce67409af57f3c7a1f9fda4c10d3.tar.bz2 rails-3ba552fb2900ce67409af57f3c7a1f9fda4c10d3.zip | |
Merge pull request #18225 from DanOlson/update-without-changing-timestamps
Provide :touch option to save() to accommodate saving without updating t...
Diffstat (limited to 'activerecord/lib/active_record/timestamp.rb')
| -rw-r--r-- | activerecord/lib/active_record/timestamp.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb index 936a18d99a..4d1d7310af 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -57,8 +57,8 @@ module ActiveRecord super end - def _update_record(*args) - if should_record_timestamps? + def _update_record(*args, touch: true, **options) + if touch && should_record_timestamps? current_time = current_time_from_proper_timezone timestamp_attributes_for_update_in_model.each do |column| @@ -67,7 +67,7 @@ module ActiveRecord write_attribute(column, current_time) end end - super + super *args end def should_record_timestamps? |