summaryrefslogtreecommitdiff
path: root/lib/gitlab/import_export/importer.rb
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2018-02-12 15:38:10 +0000
committerNick Thomas <nick@gitlab.com>2018-02-12 15:38:10 +0000
commitc6fa8c3fbaab2d7bcde5cecead129b085d5a2dae (patch)
tree68aa6e501b0fe9a21a7f427b44201fd9e86d6a82 /lib/gitlab/import_export/importer.rb
parent74c4d35250c09cf3cdcf659d51c83bc7ba83df92 (diff)
downloadgitlab-ce-c6fa8c3fbaab2d7bcde5cecead129b085d5a2dae.tar.gz
Create an empty wiki when there is no wiki in the gitlab export bundle
Diffstat (limited to 'lib/gitlab/import_export/importer.rb')
-rw-r--r--lib/gitlab/import_export/importer.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/importer.rb b/lib/gitlab/import_export/importer.rb
index c14646b0611..a00795f553e 100644
--- a/lib/gitlab/import_export/importer.rb
+++ b/lib/gitlab/import_export/importer.rb
@@ -50,9 +50,10 @@ module Gitlab
end
def wiki_restorer
- Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path,
+ Gitlab::ImportExport::WikiRestorer.new(path_to_bundle: wiki_repo_path,
shared: @shared,
- project: ProjectWiki.new(project_tree.restored_project))
+ project: ProjectWiki.new(project_tree.restored_project),
+ wiki_enabled: @project.wiki_enabled?)
end
def uploads_restorer