diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-07-17 21:16:52 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-08-07 13:06:13 -0300 |
| commit | 517a9f97c7fefb350a2f8cfac84060e8b76e2818 (patch) | |
| tree | 6d1a6fb98c87e93e84919b3297a8a1845c95120e /app/services | |
| parent | 29d380b03ce711d97fc95812618498a12f85cd02 (diff) | |
| download | gitlab-ce-517a9f97c7fefb350a2f8cfac84060e8b76e2818.tar.gz | |
Does not fetch repository when importing from GitHub on import service
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/projects/import_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb index 50ec3651515..cd661166c3b 100644 --- a/app/services/projects/import_service.rb +++ b/app/services/projects/import_service.rb @@ -34,8 +34,10 @@ module Projects def import_repository raise Error, 'Blocked import URL.' if Gitlab::UrlBlocker.blocked_url?(project.import_url) + return if project.github_import? + begin - if project.github_import? || project.gitea_import? + if project.gitea_import? fetch_repository else clone_repository @@ -55,7 +57,7 @@ module Projects end def fetch_repository - project.create_repository + project.ensure_repository project.repository.add_remote(project.import_type, project.import_url) project.repository.set_remote_as_mirror(project.import_type) project.repository.fetch_remote(project.import_type, forced: true) |