tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-26 11:28:27 +00:00
Code Releases Activity

Escape more things that are passed through str2html (#12622) (#12850)

Browse Source 
Backport #12622

* Escape more things that are passed through str2html

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Bloody editors!

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

* Update routers/user/oauth.go
This commit is contained in:
zeripath
2020-09-15 23:43:10 +01:00
committed by GitHub
parent 408db95dc1
commit 3a02f0896e
7 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/repo/issue/view_content/pull.tmpl
View File

@@ -121,7 +121,7 @@
{{else if .IsPullWorkInProgress}}
<div class="item text grey">
<i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
{{$.i18n.Tr "repo.pulls.cannot_merge_work_in_progress" .WorkInProgressPrefix | Str2html}}
{{$.i18n.Tr "repo.pulls.cannot_merge_work_in_progress" (.WorkInProgressPrefix|Escape) | Str2html}}
</div>
{{else if .Issue.PullRequest.IsChecking}}
<div class="item text yellow">