diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-12-12 16:47:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 16:47:51 -0500 |
| commit | 185a30f75289ab158abd3c21536930c37af61338 (patch) | |
| tree | 265389a1c174006be2b5200ff4609ae6b7a31093 /activemodel/lib/active_model/attribute | |
| parent | 2eee8c3bad674bc3170cfac3e8586127560a4ea5 (diff) | |
| parent | 6ddba9b46c1d307ea7e03d753d0988183b9cb80c (diff) | |
| download | rails-185a30f75289ab158abd3c21536930c37af61338.tar.gz rails-185a30f75289ab158abd3c21536930c37af61338.tar.bz2 rails-185a30f75289ab158abd3c21536930c37af61338.zip | |
Merge pull request #31405 from bogdanvlviv/fix-conflicts-counter_cache-with-touch-by-optimistic_locking
Fix conflicts `counter_cache` with `touch: true` by optimistic locking.
Diffstat (limited to 'activemodel/lib/active_model/attribute')
0 files changed, 0 insertions, 0 deletions