diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-11-15 13:33:52 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-11-15 13:33:52 +0000 |
commit | a4072db0198896242886d22c644ed91c1016aa8d (patch) | |
tree | 5d02ddbc23be5adfdad040bf3f25569d3788fee7 /lib | |
parent | 81e94ce1761b48b73be2a8d71938dfe934921e35 (diff) | |
parent | 8da236611b5182a1105111904027ae3e74ed1682 (diff) | |
download | gitlab-ce-a4072db0198896242886d22c644ed91c1016aa8d.tar.gz |
Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forks
Prefer polymorphism over specific type checks in Import service
See merge request gitlab-org/gitlab-ce!15397
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/github_import/parallel_importer.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/import_export/importer.rb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/gitlab/github_import/parallel_importer.rb b/lib/gitlab/github_import/parallel_importer.rb index 81739834b41..6da11e6ef08 100644 --- a/lib/gitlab/github_import/parallel_importer.rb +++ b/lib/gitlab/github_import/parallel_importer.rb @@ -11,6 +11,10 @@ module Gitlab true end + def self.imports_repository? + true + end + def initialize(project) @project = project end diff --git a/lib/gitlab/import_export/importer.rb b/lib/gitlab/import_export/importer.rb index fbdd74788bc..c14646b0611 100644 --- a/lib/gitlab/import_export/importer.rb +++ b/lib/gitlab/import_export/importer.rb @@ -1,6 +1,10 @@ module Gitlab module ImportExport class Importer + def self.imports_repository? + true + end + def initialize(project) @archive_file = project.import_source @current_user = project.creator |