summaryrefslogtreecommitdiff
path: root/lib/gitlab/database/migration_helpers.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-01-27 15:14:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-01-27 15:14:51 +0000
commit48f93eadd0c117a41b4e29e3d335f451a5e6e52f (patch)
treeb7ca830e2b28309a5a1fd61a6b6c646485d710f2 /lib/gitlab/database/migration_helpers.rb
parent115190b6cd73b4ba1948cf26ea883738934c614b (diff)
downloadgitlab-ce-48f93eadd0c117a41b4e29e3d335f451a5e6e52f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/database/migration_helpers.rb')
-rw-r--r--lib/gitlab/database/migration_helpers.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index a2fa2c33a39..23f8a44d2d2 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -429,6 +429,7 @@ module Gitlab
def with_lock_retries(*args, **kwargs, &block)
raise_on_exhaustion = !!kwargs.delete(:raise_on_exhaustion)
merged_args = {
+ connection: connection,
klass: self.class,
logger: Gitlab::BackgroundMigration::Logger,
allow_savepoints: true