aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorLauris BH <lauris@nix.lv>2018-01-11 01:46:59 +0200
committerKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2018-01-11 00:46:59 +0100
commitbe1330ec89308f76557bd7fc708b1f16c703f429 (patch)
treeabdcd377f6be772aa38e9840b683e09f52a5d5c4 /modules
parentd8dff304c0a6abb471051e968f6bdb69679b9a2a (diff)
downloadgitea-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 'modules')
-rw-r--r--modules/setting/setting.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 1a9262c42f..338637836d 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -215,6 +215,7 @@ var (
// Repository local settings
Local struct {
LocalCopyPath string
+ LocalWikiPath string
} `ini:"-"`
}{
AnsiCharset: "",
@@ -254,8 +255,10 @@ var (
// Repository local settings
Local: struct {
LocalCopyPath string
+ LocalWikiPath string
}{
LocalCopyPath: "tmp/local-repo",
+ LocalWikiPath: "tmp/local-wiki",
},
}
RepoRootPath string