Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Neel <brian@gitlab.com>2017-08-04 05:20:34 +0300
committerBrian Neel <brian@gitlab.com>2017-08-08 17:50:54 +0300
commit9770c57fab0315865a33c8b6df269eded0d57b5c (patch)
tree5a7c7a9fccbce5ef3ccf6b02b1297aace41101fd /config/initializers
parentb612a47da0e0225332a59ab961206f84602ad629 (diff)
Re-enable SqlInjection and CommandInjection
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/active_record_locking.rb4
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