diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-12-20 19:24:50 +0000 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-21 18:54:47 +0000 |
| commit | fc02921a993cf9c17cb29398dce3d6b8499bd5fa (patch) | |
| tree | 4e7ce65490e25ed773984a63e2a381f0565e47b4 /lib | |
| parent | 41d1de40699152e0d6019a2ffe5672ec38b7250e (diff) | |
| download | gitlab-ce-fc02921a993cf9c17cb29398dce3d6b8499bd5fa.tar.gz | |
Merge branch 'zj-empty-repo-importer' into 'master'
Migrate to Project#empty_repo?
Closes #41326
See merge request gitlab-org/gitlab-ce!16054
(cherry picked from commit e0a27ee419b55509204ba2bfbdbfbab3c7c331bc)
338f1eaf Migrate to Project#empty_repo?
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/github_import/importer/repository_importer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/github_import/importer/repository_importer.rb b/lib/gitlab/github_import/importer/repository_importer.rb index 9cf2e7fd871..7dd68a0d1cd 100644 --- a/lib/gitlab/github_import/importer/repository_importer.rb +++ b/lib/gitlab/github_import/importer/repository_importer.rb @@ -29,7 +29,7 @@ module Gitlab # this code, e.g. because we had to retry this job after # `import_wiki?` raised a rate limit error. In this case we'll skip # re-importing the main repository. - if project.repository.empty_repo? + if project.empty_repo? import_repository else true |