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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 14:18:50 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 14:18:50 +0300
commit8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch)
treea77e7fe7a93de11213032ed4ab1f33a3db51b738 /lib/gitlab/phabricator_import
parent00b35af3db1abfe813a778f643dad221aad51fca (diff)
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'lib/gitlab/phabricator_import')
-rw-r--r--lib/gitlab/phabricator_import/cache/map.rb2
-rw-r--r--lib/gitlab/phabricator_import/worker_state.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/phabricator_import/cache/map.rb b/lib/gitlab/phabricator_import/cache/map.rb
index 6a2841b6a8e..7aba3cf26fd 100644
--- a/lib/gitlab/phabricator_import/cache/map.rb
+++ b/lib/gitlab/phabricator_import/cache/map.rb
@@ -63,7 +63,7 @@ module Gitlab
def timeout
# Setting the timeout to the same one as we do for clearing stuck jobs
# this makes sure all cache is available while the import is running.
- StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION
+ Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
end
end
end
diff --git a/lib/gitlab/phabricator_import/worker_state.rb b/lib/gitlab/phabricator_import/worker_state.rb
index 38829e34509..ffa2d3d7a43 100644
--- a/lib/gitlab/phabricator_import/worker_state.rb
+++ b/lib/gitlab/phabricator_import/worker_state.rb
@@ -40,7 +40,7 @@ module Gitlab
def timeout
# Make sure we get rid of all the information after a job is marked
# as failed/succeeded
- StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION
+ Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
end
end
end