use git bundle in import and add wiki repo to import

1 files changed, 5 insertions, 6 deletions

diff --git a/lib/gitlab/import_export/repo_restorer.rb b/lib/gitlab/import_export/repo_restorer.rb
index b34581deeb5..dc45238bf2a 100644
--- a/lib/gitlab/import_export/repo_restorer.rb
+++ b/lib/gitlab/import_export/repo_restorer.rb
@@ -3,19 +3,18 @@ module Gitlab
     class RepoRestorer
       include Gitlab::ImportExport::CommandLineUtil
 
-      def initialize(project:, path:)
+      def initialize(project:, path_to_bundle: )
         @project = project
-        # TODO remove magic keyword and move it to a shared config
-        @path = File.join(path, 'project.bundle')
+        @path_to_bundle = path_to_bundle
       end
 
       def restore
-        return false unless File.exists?(@path)
-        # Move repos dir to 'repositories.old' dir
+        return true unless File.exists?(@path)
 
         FileUtils.mkdir_p(repos_path)
         FileUtils.mkdir_p(path_to_repo)
-        untar_xf(archive: @path, dir: path_to_repo)
+
+        git_unbundle(git_bin_path: Gitlab.config.git.bin_path, repo_path: path_to_repo, bundle_path: @path_to_bundle)
       end
 
       private