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/github_import | |
parent | 2c156e3c7bbade01c36eee18327f1ced6eebea79 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/github_import')
-rw-r--r-- | lib/gitlab/github_import/importer/repository_importer.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/github_import/importer/repository_importer.rb b/lib/gitlab/github_import/importer/repository_importer.rb index 6aad7955415..7ae91912b8a 100644 --- a/lib/gitlab/github_import/importer/repository_importer.rb +++ b/lib/gitlab/github_import/importer/repository_importer.rb @@ -4,7 +4,6 @@ module Gitlab module GithubImport module Importer class RepositoryImporter - include Gitlab::ShellAdapter include Gitlab::Utils::StrongMemoize attr_reader :project, :client, :wiki_formatter @@ -65,10 +64,10 @@ module Gitlab end def import_wiki_repository - gitlab_shell.import_wiki_repository(project, wiki_formatter) + project.wiki.repository.import_repository(wiki_formatter.import_url) true - rescue Gitlab::Shell::Error => e + rescue ::Gitlab::Git::CommandError => e if e.message !~ /repository not exported/ project.create_wiki fail_import("Failed to import the wiki: #{e.message}") |