Merge branch 'master'

2019-05-08 23:57:57 +02:00
parent c097a29d69
commit 3a3ccf801b
326 changed files with 37528 additions and 829 deletions
--- a/contrib/pr/checkout.go
+++ b/contrib/pr/checkout.go
@@ -43,6 +43,7 @@ func runPR() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	setting.SetCustomPathAndConf("", "")
 	setting.NewContext()

 	setting.RepoRootPath, err = ioutil.TempDir(os.TempDir(), "repos")