summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-11-15 13:27:37 +0100
committerDouwe Maan <douwe@selenight.nl>2017-11-15 13:40:35 +0100
commit8da236611b5182a1105111904027ae3e74ed1682 (patch)
tree40d3e2de5330495f382bfda4ea07762546cd1630 /app
parent148f40792c5a619054f71ec4ece522fb0adfbda8 (diff)
downloadgitlab-ce-8da236611b5182a1105111904027ae3e74ed1682.tar.gz
Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphism
Diffstat (limited to 'app')
-rw-r--r--app/models/project.rb4
-rw-r--r--app/services/projects/import_service.rb22
2 files changed, 11 insertions, 15 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index bae16b6b2af..8da03e23057 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -704,10 +704,6 @@ class Project < ActiveRecord::Base
import_type == 'gitea'
end
- def github_import?
- import_type == 'github'
- end
-
def check_limit
unless creator.can_create_project? || namespace.kind == 'group'
projects_limit = creator.projects_limit
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb
index c950da44aba..c3b11341b4d 100644
--- a/app/services/projects/import_service.rb
+++ b/app/services/projects/import_service.rb
@@ -11,13 +11,11 @@ module Projects
# supported by an importer class (`Gitlab::GithubImport::ParallelImporter`
# for example).
def async?
- return false unless has_importer?
-
- !!importer_class.try(:async?)
+ has_importer? && !!importer_class.try(:async?)
end
def execute
- add_repository_to_project unless project.gitlab_project_import?
+ add_repository_to_project
import_data
@@ -29,6 +27,14 @@ module Projects
private
def add_repository_to_project
+ if project.external_import? && !unknown_url?
+ raise Error, 'Blocked import URL.' if Gitlab::UrlBlocker.blocked_url?(project.import_url)
+ end
+
+ # We should skip the repository for a GitHub import or GitLab project import,
+ # because these importers fetch the project repositories for us.
+ return if has_importer? && importer_class.try(:imports_repository?)
+
if unknown_url?
# In this case, we only want to import issues, not a repository.
create_repository
@@ -44,12 +50,6 @@ module Projects
end
def import_repository
- raise Error, 'Blocked import URL.' if Gitlab::UrlBlocker.blocked_url?(project.import_url)
-
- # We should return early for a GitHub import because the new GitHub
- # importer fetch the project repositories for us.
- return if project.github_import?
-
begin
if project.gitea_import?
fetch_repository
@@ -88,7 +88,7 @@ module Projects
end
def importer_class
- Gitlab::ImportSources.importer(project.import_type)
+ @importer_class ||= Gitlab::ImportSources.importer(project.import_type)
end
def has_importer?