Commit 57e0cdcc authored by Mark Chao's avatar Mark Chao

Merge branch 'kassio/remove-unnecessary-conditional' into 'master'

Remove unnecessary conditional

See merge request gitlab-org/gitlab!44320
parents c8a39e1a 5a5aad67
...@@ -999,9 +999,6 @@ class Project < ApplicationRecord ...@@ -999,9 +999,6 @@ class Project < ApplicationRecord
job_id = job_id =
if forked? if forked?
RepositoryForkWorker.perform_async(id) RepositoryForkWorker.perform_async(id)
elsif gitlab_project_import?
# Do not retry on Import/Export until https://gitlab.com/gitlab-org/gitlab-foss/issues/26189 is solved.
RepositoryImportWorker.set(retry: false).perform_async(self.id)
else else
RepositoryImportWorker.perform_async(self.id) RepositoryImportWorker.perform_async(self.id)
end end
......
...@@ -7,6 +7,7 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -7,6 +7,7 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker
feature_category :importers feature_category :importers
worker_has_external_dependencies! worker_has_external_dependencies!
# Do not retry on Import/Export until https://gitlab.com/gitlab-org/gitlab/-/issues/16812 is solved.
sidekiq_options retry: false sidekiq_options retry: false
sidekiq_options status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION sidekiq_options status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment