Commit f06c5516 authored by James Lopez's avatar James Lopez

fix issue in import_service

parent 385d6df2
...@@ -10,7 +10,7 @@ module Gitlab ...@@ -10,7 +10,7 @@ module Gitlab
@archive_file = archive_file @archive_file = archive_file
@current_user = owner @current_user = owner
@namespace = Namespace.find(namespace_id) @namespace = Namespace.find(namespace_id)
@shared = Gitlab::ImportExport::Shared.new(relative_path: path_with_namespace, project_path: project_path) @shared = Gitlab::ImportExport::Shared.new(relative_path: path_with_namespace(project_path), project_path: project_path)
end end
def execute def execute
...@@ -43,8 +43,8 @@ module Gitlab ...@@ -43,8 +43,8 @@ module Gitlab
project: ProjectWiki.new(project_tree.project)).restore project: ProjectWiki.new(project_tree.project)).restore
end end
def path_with_namespace def path_with_namespace(project_path)
File.join(@namespace.path, @shared.opts[:project_path]) File.join(@namespace.path, project_path)
end end
def repo_path def repo_path
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment