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

fix wiki check

Browse source
This commit is contained in:
James Lopez 2018-01-02 10:38:51 +01:00
parent 9d0bceb3f0
commit 54f00b7487
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/gitlab/bare_repository_import/importer.rb
View file

@ -77,6 +77,8 @@ module Gitlab
if bare_repo.wiki_exists? if bare_repo.wiki_exists?
FileUtils.mv(wiki_path, File.join(project.repository_storage_path, project.disk_path + '.wiki.git')) FileUtils.mv(wiki_path, File.join(project.repository_storage_path, project.disk_path + '.wiki.git'))
else
project.create_wiki
end end
true true

1
spec/lib/gitlab/bare_repository_import/importer_spec.rb
View file

@ -137,6 +137,7 @@ describe Gitlab::BareRepositoryImport::Importer, repository: true do
project = Project.find_by_full_path("#{admin.full_path}/#{project_path}") project = Project.find_by_full_path("#{admin.full_path}/#{project_path}")
expect(File).to exist(File.join(project.repository_storage_path, project.disk_path + '.git')) expect(File).to exist(File.join(project.repository_storage_path, project.disk_path + '.git'))
expect(File).to exist(File.join(project.repository_storage_path, project.disk_path + '.wiki.git'))
end end
it 'moves an existing project to the correct path' do it 'moves an existing project to the correct path' do