diff options
author | Unknown <joe2010xtmf@163.com> | 2014-05-30 16:35:35 -0400 |
---|---|---|
committer | Unknown <joe2010xtmf@163.com> | 2014-05-30 16:35:35 -0400 |
commit | 422043f422dec1478d090f01d4ade9cb64c0f0c5 (patch) | |
tree | 060e7830f86a582c03bccf45b459edabe25ff1a0 /routers/repo/repo.go | |
parent | 617bbe3feec23f2c7cb5c32df8532999fda74203 (diff) |
Fix #219
Diffstat (limited to 'routers/repo/repo.go')
-rw-r--r-- | routers/repo/repo.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 286f558b..6db45300 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -5,6 +5,7 @@ package repo import ( + "bytes" "encoding/base64" "errors" "fmt" @@ -82,7 +83,7 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) { authStr := strings.Replace(fmt.Sprintf("://%s:%s", form.AuthUserName, form.AuthPasswd), "@", "%40", -1) - url := strings.Replace(form.Url, "://", authStr, 1) + "@" + url := strings.Replace(form.Url, "://", authStr+"@", 1) repo, err := models.MigrateRepository(ctx.User, form.RepoName, form.Description, form.Private, form.Mirror, url) if err == nil { @@ -254,8 +255,11 @@ func Single(ctx *middleware.Context, params martini.Params) { if isTextFile { d, _ := ioutil.ReadAll(dataRc) buf = append(buf, d...) - if base.IsMarkdownFile(readmeFile.Name()) { + switch { + case base.IsMarkdownFile(readmeFile.Name()): buf = base.RenderMarkdown(buf, branchLink) + default: + buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1) } ctx.Data["FileContent"] = string(buf) } |