Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into…

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

Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into…
f927e728 · James Lopez · 99a5d07c · 9c60eca8 · f927e728
Commit f927e728 authored May 05, 2016 by James Lopez
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

import_service.rb lib/gitlab/import_export/import_service.rb +1 -1

No files found.
--- a/lib/gitlab/import_export/import_service.rb
+++ b/lib/gitlab/import_export/import_service.rb
@@ -33,7 +33,7 @@ module Gitlab
      end
      def restore_wiki_repo
-        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path, project: project_tree.project).restore
+        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path, project: ProjectWiki.new(project_tree.project)).restore
      end
      def storage_path