diff options
| author | Lauris BH <lauris@nix.lv> | 2018-01-11 01:46:59 +0200 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2018-01-11 00:46:59 +0100 |
| commit | be1330ec89308f76557bd7fc708b1f16c703f429 (patch) | |
| tree | abdcd377f6be772aa38e9840b683e09f52a5d5c4 /models/wiki.go | |
| parent | d8dff304c0a6abb471051e968f6bdb69679b9a2a (diff) | |
| download | gitea-be1330ec89308f76557bd7fc708b1f16c703f429.tar.gz gitea-be1330ec89308f76557bd7fc708b1f16c703f429.zip | |
Remove hardcoded paths to fix randomly failing tests (#3347)
* Remove hardcoded paths to fix randomly failing tests
* Use correct function for merge path
Diffstat (limited to 'models/wiki.go')
| -rw-r--r-- | models/wiki.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/models/wiki.go b/models/wiki.go index 3819eb95f0..3a39daf0f6 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -90,9 +90,17 @@ func (repo *Repository) InitWiki() error { return nil } +// LocalWikiPath returns the local wiki repository copy path. +func LocalWikiPath() string { + if filepath.IsAbs(setting.Repository.Local.LocalWikiPath) { + return setting.Repository.Local.LocalWikiPath + } + return path.Join(setting.AppDataPath, setting.Repository.Local.LocalWikiPath) +} + // LocalWikiPath returns the path to the local wiki repository (?). func (repo *Repository) LocalWikiPath() string { - return path.Join(setting.AppDataPath, "tmp/local-wiki", com.ToStr(repo.ID)) + return path.Join(LocalWikiPath(), com.ToStr(repo.ID)) } // UpdateLocalWiki makes sure the local copy of repository wiki is up-to-date. |