kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fix issue in import_service

Browse source
This commit is contained in:
James Lopez 2016-05-12 10:57:28 +02:00
parent 385d6df20c
commit f06c5516db
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/gitlab/import_export/import_service.rb
View file

@ -10,7 +10,7 @@ module Gitlab
@archive_file = archive_file
@current_user = owner
@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
def execute
@ -43,8 +43,8 @@ module Gitlab
project: ProjectWiki.new(project_tree.project)).restore
end
def path_with_namespace
File.join(@namespace.path, @shared.opts[:project_path])
def path_with_namespace(project_path)
File.join(@namespace.path, project_path)
end
def repo_path