Commit bc734d34 authored by Nick Thomas's avatar Nick Thomas

Merge branch '37391-wiki-disk-path-helper' into 'master'

Use wiki.disk_path

See merge request gitlab-org/gitlab-ce!14930
parents b4dc0ba2 314e5b5f
...@@ -51,7 +51,7 @@ module Projects ...@@ -51,7 +51,7 @@ module Projects
end end
def wiki_path def wiki_path
repo_path + '.wiki' project.wiki.disk_path
end end
def trash_repositories! def trash_repositories!
......
...@@ -74,7 +74,7 @@ module Github ...@@ -74,7 +74,7 @@ module Github
def fetch_wiki_repository def fetch_wiki_repository
return if project.wiki.repository_exists? return if project.wiki.repository_exists?
wiki_path = "#{project.disk_path}.wiki" wiki_path = project.wiki.disk_path
gitlab_shell.import_repository(project.repository_storage_path, wiki_path, wiki_url) gitlab_shell.import_repository(project.repository_storage_path, wiki_path, wiki_url)
rescue Gitlab::Shell::Error => e rescue Gitlab::Shell::Error => e
# GitHub error message when the wiki repo has not been created, # GitHub error message when the wiki repo has not been created,
......
...@@ -8,7 +8,7 @@ module Gitlab ...@@ -8,7 +8,7 @@ module Gitlab
end end
def disk_path def disk_path
"#{project.disk_path}.wiki" project.wiki.disk_path
end end
def import_url def import_url
......
...@@ -11,7 +11,7 @@ describe Gitlab::GithubImport::WikiFormatter do ...@@ -11,7 +11,7 @@ describe Gitlab::GithubImport::WikiFormatter do
describe '#disk_path' do describe '#disk_path' do
it 'appends .wiki to project path' do it 'appends .wiki to project path' do
expect(wiki.disk_path).to eq project.disk_path + '.wiki' expect(wiki.disk_path).to eq project.wiki.disk_path
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment