Merge branch 'master' into only-close-the-gitrepo-at-the-end-of-wrap

6543 · web-flow · commit 73b34f8c2f11 · 2021-04-28T22:37:42.000+02:00
diff --git a/routers/repo/view.go b/routers/repo/view.go
@@ -512,6 +512,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 			}
 			ctx.Data["FileContent"] = result.String()
 		} else if readmeExist {
+			buf, _ := ioutil.ReadAll(rd)
 			ctx.Data["IsRenderedHTML"] = true
 			ctx.Data["FileContent"] = strings.ReplaceAll(
 				gotemplate.HTMLEscapeString(string(buf)), "\n", `<br>`,

Original file line number	Diff line number	Diff line change
`@@ -512,6 +512,7 @@ func renderFile(ctx context.Context, entry git.TreeEntry, treeLink, rawLink st`
`512`	`512`	`}`
`513`	`513`	`ctx.Data["FileContent"] = result.String()`
`514`	`514`	`} else if readmeExist {`
	`515`	`+ buf, _ := ioutil.ReadAll(rd)`
`515`	`516`	`ctx.Data["IsRenderedHTML"] = true`
`516`	`517`	`ctx.Data["FileContent"] = strings.ReplaceAll(`
`517`	`518`	gotemplate.HTMLEscapeString(string(buf)), "\n", `<br>`,