diff options
| author | DJ Mountney <david@twkie.net> | 2017-03-20 18:55:40 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-20 18:55:40 -0700 |
| commit | 4ea85da9fb99bc4d875cc3dc644476f34f0b8bc3 (patch) | |
| tree | 4da8d0ca1ef292db5eca8e00ae9ce59e55647b82 /app/services | |
| parent | f5bc48cf5b639644fc4bf8b6d41cc82cf2eeaf84 (diff) | |
| parent | 7be39a894b27c0c0e4fab52c2f8147f216376538 (diff) | |
| download | gitlab-ce-4ea85da9fb99bc4d875cc3dc644476f34f0b8bc3.tar.gz | |
Merge remote-tracking branch 'dev/master'
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/projects/import_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb index 1c5a549feb9..d484a96f785 100644 --- a/app/services/projects/import_service.rb +++ b/app/services/projects/import_service.rb @@ -33,6 +33,7 @@ module Projects def import_repository begin + raise Error, "Blocked import URL." if Gitlab::UrlBlocker.blocked_url?(project.import_url) gitlab_shell.import_repository(project.repository_storage_path, project.path_with_namespace, project.import_url) rescue => e # Expire cache to prevent scenarios such as: @@ -40,7 +41,7 @@ module Projects # 2. Retried import, repo is broken or not imported but +exists?+ still returns true project.repository.before_import if project.repository_exists? - raise Error, "Error importing repository #{project.import_url} into #{project.path_with_namespace} - #{e.message}" + raise Error, "Error importing repository #{project.import_url} into #{project.path_with_namespace} - #{e.message}" end end |