summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-10-28 12:44:32 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-10-28 12:44:32 +0000
commit4fd015183cdb280083384c69261c2ab5d475a54b (patch)
tree9cfe91078ab13686c440a78184b0a6164f2c0fea /app
parent04c7c8d8bbc99eaee728c1ca3572b7ae2dc8d2fb (diff)
parentf68d9261b0fa09c03ef8b92d8941d3b6577d9a2a (diff)
downloadgitlab-ce-4fd015183cdb280083384c69261c2ab5d475a54b.tar.gz
Merge branch 'fix/make-github-import-retryable' into 'master'
Modify GitHub importer to be retryable Closes #23533 See merge request !7003
Diffstat (limited to 'app')
-rw-r--r--app/services/projects/import_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb
index e466ffa60eb..d7221fe993c 100644
--- a/app/services/projects/import_service.rb
+++ b/app/services/projects/import_service.rb
@@ -29,7 +29,7 @@ module Projects
if unknown_url?
# In this case, we only want to import issues, not a repository.
create_repository
- else
+ elsif !project.repository_exists?
import_repository
end
end