diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-11-20 18:16:29 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-11-20 19:14:41 +0300 |
| commit | f2977c63a8e61ccc5d38b083851f0f8769691036 (patch) | |
| tree | 8263aa7b3202c6d2ad4a16ac88eb4537aac15ec0 /lib/gitlab/bitbucket_import | |
| parent | 9414bb00c40bb0fe157057dec497bc70df6db11e (diff) | |
Fix bitbucket wiki import with hashed storage enabled
Diffstat (limited to 'lib/gitlab/bitbucket_import')
| -rw-r--r-- | lib/gitlab/bitbucket_import/importer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb index 033ecd15749..d48ae17aeaf 100644 --- a/lib/gitlab/bitbucket_import/importer.rb +++ b/lib/gitlab/bitbucket_import/importer.rb @@ -61,9 +61,9 @@ module Gitlab def import_wiki return if project.wiki.repository_exists? - path_with_namespace = "#{project.full_path}.wiki" + disk_path = project.wiki.disk_path import_url = project.import_url.sub(/\.git\z/, ".git/wiki") - gitlab_shell.import_repository(project.repository_storage_path, path_with_namespace, import_url) + gitlab_shell.import_repository(project.repository_storage_path, disk_path, import_url) rescue StandardError => e errors << { type: :wiki, errors: e.message } end |