aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/repo.go2
-rw-r--r--models/wiki.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/models/repo.go b/models/repo.go
index 6ed7cd18..827c9aaf 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -854,7 +854,7 @@ type CreateRepoOptions struct {
}
func getRepoInitFile(tp, name string) ([]byte, error) {
- relPath := path.Join("conf", tp, strings.TrimLeft(name, "./"))
+ relPath := path.Join("conf", tp, strings.TrimLeft(path.Clean("/"+name), "/"))
// Use custom file when available.
customPath := path.Join(setting.CustomPath, relPath)
diff --git a/models/wiki.go b/models/wiki.go
index 24d07938..7e085d0a 100644
--- a/models/wiki.go
+++ b/models/wiki.go
@@ -33,7 +33,7 @@ func ToWikiPageURL(name string) string {
// that are not belong to wiki repository.
func ToWikiPageName(urlString string) string {
name, _ := url.QueryUnescape(urlString)
- return strings.Replace(strings.TrimLeft(name, "./"), "/", " ", -1)
+ return strings.Replace(strings.TrimLeft(path.Clean("/"+name), "/"), "/", " ", -1)
}
// WikiCloneLink returns clone URLs of repository wiki.