diff options
| author | James Lopez <james@jameslopez.es> | 2018-01-26 13:14:54 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-01-26 17:26:26 +0300 |
| commit | 7affc2311282a032722af245abb92f0bd2da8db9 (patch) | |
| tree | 009e6dd2be7aaa8b72ca9c999c61de975e130ef0 /app | |
| parent | 865bb64a06f33b1076d1b9a202cd41c7ad0728c5 (diff) | |
add spec
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 1 | ||||
| -rw-r--r-- | app/workers/repository_import_worker.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 8a5895cea05..d0d0fd6e093 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -569,6 +569,7 @@ class Project < ActiveRecord::Base forked_from_project.repository_storage_path, forked_from_project.disk_path) elsif gitlab_project_import? + # Do not retry on Import/Export until https://gitlab.com/gitlab-org/gitlab-ce/issues/26189 is solved. RepositoryImportWorker.set(retry: false).perform_async(self.id) else RepositoryImportWorker.perform_async(self.id) diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 1a8be9d9a93..d79b5ee5346 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -21,7 +21,6 @@ class RepositoryImportWorker return if service.async? if result[:status] == :error - fail_import(project, result[:message]) if project.gitlab_project_import? raise result[:message] |