diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 21:08:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 21:08:47 +0300 |
commit | 6b9d3a4e8351e662c4586b24bb152de78ae9e3bf (patch) | |
tree | 883e9db60c047c54418fc1d2b1c5517f97e0f185 /config/initializers/config_initializers_active_record_locking.rb | |
parent | 23288f62da73fb0e30d8e7ce306665e8fda1b932 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/config_initializers_active_record_locking.rb')
-rw-r--r-- | config/initializers/config_initializers_active_record_locking.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/config_initializers_active_record_locking.rb b/config/initializers/config_initializers_active_record_locking.rb index 915247826e9..9f9908283c6 100644 --- a/config/initializers/config_initializers_active_record_locking.rb +++ b/config/initializers/config_initializers_active_record_locking.rb @@ -26,7 +26,7 @@ module ActiveRecord locking_column => possible_previous_lock_value, self.class.primary_key => id_in_database ).update_all( - attributes_with_values_for_update(attribute_names) + attributes_with_values(attribute_names) ) if affected_rows != 1 |