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

Merge branches 'feature/project-export-ui-experimental' and…
2a70d963 · James Lopez · 7a80880f · 385d6df2 · 2a70d963
Commit 2a70d963 authored May 12, 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
@@ -44,7 +44,7 @@ module Gitlab
      end

      def path_with_namespace
-        File.join(@namespace.path, @project_path)
+        File.join(@namespace.path, @shared.opts[:project_path])
      end

      def repo_path