diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-18 17:00:26 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-24 15:07:24 +0100 |
| commit | 6979b3afd50f86550e523ed66ef22fd153e6cbc8 (patch) | |
| tree | adf4ed031262b7986dc8e5325cdbb9271783eb5e /app/workers | |
| parent | f2b37de54ba3cb0a375fb3a03e7ffd1f18444c39 (diff) | |
| download | gitlab-ce-6979b3afd50f86550e523ed66ef22fd153e6cbc8.tar.gz | |
Delete deploy key from Bitbucket after importing.
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/repository_import_worker.rb | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index d7e759fb470..437640d2305 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -6,27 +6,27 @@ class RepositoryImportWorker def perform(project_id) project = Project.find(project_id) - result = gitlab_shell.send(:import_repository, + + import_result = gitlab_shell.send(:import_repository, project.path_with_namespace, project.import_url) + return project.import_fail unless import_result - result_of_data_import = 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 - else - true - 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 + else + true + end + return project.import_fail unless data_import_result - if result && result_of_data_import - project.import_finish - project.save - project.satellite.create unless project.satellite.exists? - project.update_repository_size - else - project.import_fail - end + project.import_finish + project.save + project.satellite.create unless project.satellite.exists? + project.update_repository_size + Gitlab::BitbucketImport::KeyDeleter.new(project).execute if project.import_type == 'bitbucket' end end |