diff options
| author | Jared Szechy <jared.szechy@brilligent.com> | 2015-08-04 18:21:12 -0400 |
|---|---|---|
| committer | Jared Szechy <jared.szechy@brilligent.com> | 2015-09-08 20:23:01 -0400 |
| commit | e156f42079ebf8247b6a39fa6314d4d5c6b73d12 (patch) | |
| tree | 8a4c08adda59c7cdd09fb2164df43d8b950b0389 /app/workers | |
| parent | 86556a079e34eb1267e63f7b39cc018665e21bfc (diff) | |
| download | gitlab-ce-e156f42079ebf8247b6a39fa6314d4d5c6b73d12.tar.gz | |
FogBugz project import
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/repository_import_worker.rb | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index f2ba2e15e7b..ea2808045eb 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -7,22 +7,31 @@ class RepositoryImportWorker def perform(project_id) project = Project.find(project_id) - import_result = gitlab_shell.send(:import_repository, + unless project.import_url == Project::UNKNOWN_IMPORT_URL + import_result = gitlab_shell.send(:import_repository, project.path_with_namespace, project.import_url) - return project.import_fail unless import_result + return project.import_fail unless import_result + else + unless project.create_repository + return project.import_fail + end + end - data_import_result = if project.import_type == 'github' - Gitlab::GithubImport::Importer.new(project).execute - elsif project.import_type == 'gitlab' - Gitlab::GitlabImport::Importer.new(project).execute - elsif project.import_type == 'bitbucket' - Gitlab::BitbucketImport::Importer.new(project).execute - elsif project.import_type == 'google_code' - Gitlab::GoogleCodeImport::Importer.new(project).execute - else - true - end + data_import_result = case project.import_type + when 'github' + Gitlab::GithubImport::Importer.new(project).execute + when 'gitlab' + Gitlab::GitlabImport::Importer.new(project).execute + when 'bitbucket' + Gitlab::BitbucketImport::Importer.new(project).execute + when 'google_code' + Gitlab::GoogleCodeImport::Importer.new(project).execute + when 'fogbugz' + Gitlab::FogbugzImport::Importer.new(project).execute + else + true + end return project.import_fail unless data_import_result Gitlab::BitbucketImport::KeyDeleter.new(project).execute if project.import_type == 'bitbucket' |