Merge branches 'feature/project-export-ui-experimental' and...

Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

lib/gitlab/import_export/import_service.rb

@@ -29,11 +29,11 @@ module Gitlab
       end
 
       def restore_repo
-        Gitlab::ImportExport::RepoRestorer.new(path: repo_path, project: project_tree.project).restore
+        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: repo_path, project: project_tree.project).restore
       end
 
       def restore_wiki_repo
-        Gitlab::ImportExport::RepoRestorer.new(path: wiki_repo_path, project: project_tree.project).restore
+        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path, project: project_tree.project).restore
       end
 
       def storage_path