diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-20 21:08:36 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-23 04:36:34 +0300 |
| commit | 3edc0d1cc1d8bf1f17196f7234246b9ba4c57037 (patch) | |
| tree | 3e1b0ed14f3313a8f7367b10c2e2572a539781e3 /lib | |
| parent | c75bb334405fd29804716c56a0c65705df21f406 (diff) | |
Merge branch '40292-bitbucket-import-hashed-storage' into 'master'
Fix bitbucket wiki import with hashed storage enabled
Closes #40292
See merge request gitlab-org/gitlab-ce!15490
(cherry picked from commit c043ba67c2d6a9493518408fd198dea30ce6cfcb)
f2977c63 Fix bitbucket wiki import with hashed storage enabled
Diffstat (limited to 'lib')
| -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 |