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

lib/gitlab/import_export/import_service.rb

@@ -45,11 +45,11 @@ module Gitlab
       end
 
       def repo_path
-        File.join('storage_path', 'project.bundle')
+        File.join(storage_path, 'project.bundle')
       end
 
       def wiki_repo_path
-        File.join('storage_path', 'project.wiki.bundle')
+        File.join(storage_path, 'project.wiki.bundle')
       end
     end
   end

lib/gitlab/import_export/repo_restorer.rb

@@ -14,7 +14,7 @@ module Gitlab
         FileUtils.mkdir_p(repos_path)
         FileUtils.mkdir_p(path_to_repo)
 
-        git_unbundle(git_bin_path: Gitlab.config.git.bin_path, repo_path: path_to_repo, bundle_path: @path_to_bundle)
+        git_unbundle(repo_path: path_to_repo, bundle_path: @path_to_bundle)
       rescue
         false
       end