diff options
author | Xavier Noria <fxn@hashref.com> | 2016-08-07 11:48:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-07 11:48:29 +0200 |
commit | fb98d2e57162876c0e1823a5357bc44a932d08b9 (patch) | |
tree | 2c3225f7698ef3f7b2556510136c64a58ecf7355 /activerecord/lib/active_record/locking | |
parent | 0d12708f3967fe93c172b30bd3e98e4433761c36 (diff) | |
parent | 762e3f05f3d372cb32570db0deeef27232c4dd00 (diff) | |
download | rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.gz rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.bz2 rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.zip |
Merge pull request #26077 from kamipo/add_stype_empty_lines
Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty lines
Diffstat (limited to 'activerecord/lib/active_record/locking')
-rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 21a6a2c55f..1b6cda3861 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -184,7 +184,6 @@ module ActiveRecord end end - # In de/serialize we change `nil` to 0, so that we can allow passing # `nil` values to `lock_version`, and not result in `ActiveRecord::StaleObjectError` # during update record. |