mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-09-15 18:56:59 +00:00
Backport #28454 (the only conflict is caused by some comments)
* Close #24483
* Close #28123
* Close #23682
* Close #23149
(cherry picked from commit a3f403f438
)
Conflicts:
modules/setting/ui.go
trivial context conflict
This commit is contained in:
parent
c5ac659d1b
commit
cd5a0ec1c8
17 changed files with 112 additions and 148 deletions
|
@ -310,8 +310,7 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m
|
|||
lexerName = lexerNameForLine
|
||||
}
|
||||
|
||||
br.EscapeStatus, line = charset.EscapeControlHTML(line, ctx.Locale)
|
||||
br.Code = gotemplate.HTML(line)
|
||||
br.EscapeStatus, br.Code = charset.EscapeControlHTML(line, ctx.Locale)
|
||||
rows = append(rows, br)
|
||||
escapeStatus = escapeStatus.Or(br.EscapeStatus)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue