diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
commit | 5afcbe03ead9ada87621888a31a62652b10a7e4f (patch) | |
tree | 9918b67a0d0f0bafa6542e839a8be37adf73102d /app/workers/concerns/gitlab/bitbucket_server_import | |
parent | c97c0201564848c1f53226fe19d71fdcc472f7d0 (diff) |
Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42
Diffstat (limited to 'app/workers/concerns/gitlab/bitbucket_server_import')
-rw-r--r-- | app/workers/concerns/gitlab/bitbucket_server_import/object_importer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/concerns/gitlab/bitbucket_server_import/object_importer.rb b/app/workers/concerns/gitlab/bitbucket_server_import/object_importer.rb index b209719479b..1090d82c922 100644 --- a/app/workers/concerns/gitlab/bitbucket_server_import/object_importer.rb +++ b/app/workers/concerns/gitlab/bitbucket_server_import/object_importer.rb @@ -23,7 +23,7 @@ module Gitlab # If a job is being exhausted we still want to notify the # Gitlab::Import::AdvanceStageWorker to prevent the entire import from getting stuck if args.length == 3 && (key = args.last) && key.is_a?(String) - JobWaiter.notify(key, jid) + JobWaiter.notify(key, jid, ttl: Gitlab::Import::JOB_WAITER_TTL) end end end @@ -61,7 +61,7 @@ module Gitlab end def notify_waiter(key) - JobWaiter.notify(key, jid) + JobWaiter.notify(key, jid, ttl: Gitlab::Import::JOB_WAITER_TTL) end # Returns the class to use for importing the object. |