diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-08 19:31:24 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-08-08 19:31:24 +0000 |
| commit | 85c38ddb1dbe56de87d8e98b1cfdd76a0c67838a (patch) | |
| tree | 90b319cc31dc7b22e989e7c160bab4131cdb2c36 /config/initializers/active_record_locking.rb | |
| parent | b9da47d3b2c376ef8d0f6a951c0256bbc58b2854 (diff) | |
| parent | 9770c57fab0315865a33c8b6df269eded0d57b5c (diff) | |
| download | gitlab-ce-85c38ddb1dbe56de87d8e98b1cfdd76a0c67838a.tar.gz | |
Merge branch 'add-rubocop-gitlab-security' into 'master'
Add rubocop-gitlab-security gem
See merge request !12177
Diffstat (limited to 'config/initializers/active_record_locking.rb')
| -rw-r--r-- | config/initializers/active_record_locking.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/active_record_locking.rb b/config/initializers/active_record_locking.rb index 9266ff0f615..150aaa2a8c2 100644 --- a/config/initializers/active_record_locking.rb +++ b/config/initializers/active_record_locking.rb @@ -18,7 +18,7 @@ module ActiveRecord lock_col = self.class.locking_column - previous_lock_value = send(lock_col).to_i + previous_lock_value = send(lock_col).to_i # rubocop:disable GitlabSecurity/PublicSend # This line is added as a patch previous_lock_value = nil if previous_lock_value == '0' || previous_lock_value == 0 @@ -48,7 +48,7 @@ module ActiveRecord # If something went wrong, revert the version. rescue Exception - send(lock_col + '=', previous_lock_value) + send(lock_col + '=', previous_lock_value) # rubocop:disable GitlabSecurity/PublicSend raise end end |