diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0300 |
commit | 154b9bae142ba15fec753f44327654595094b879 (patch) | |
tree | 027f8ae024961778d5b00c77a72fe302f985d4f3 /lib/gitlab/legacy_github_import | |
parent | 2c156e3c7bbade01c36eee18327f1ced6eebea79 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/legacy_github_import')
-rw-r--r-- | lib/gitlab/legacy_github_import/importer.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/gitlab/legacy_github_import/importer.rb b/lib/gitlab/legacy_github_import/importer.rb index 751726d4810..3f9fd1b1a19 100644 --- a/lib/gitlab/legacy_github_import/importer.rb +++ b/lib/gitlab/legacy_github_import/importer.rb @@ -3,8 +3,6 @@ module Gitlab module LegacyGithubImport class Importer - include Gitlab::ShellAdapter - def self.refmap Gitlab::GithubImport.refmap end @@ -264,11 +262,11 @@ module Gitlab end def import_wiki - unless project.wiki.repository_exists? - wiki = WikiFormatter.new(project) - gitlab_shell.import_wiki_repository(project, wiki) - end - rescue Gitlab::Shell::Error => e + return if project.wiki.repository_exists? + + wiki = WikiFormatter.new(project) + project.wiki.repository.import_repository(wiki.import_url) + rescue ::Gitlab::Git::CommandError => e # GitHub error message when the wiki repo has not been created, # this means that repo has wiki enabled, but have no pages. So, # we can skip the import. |