Skip to content

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

Merged
techknowlogick merged 2 commits into
go-gitea:release/v1.12from
zeripath:backport-12622
Sep 15, 2020
Merged

Escape more things that are passed through str2html (#12622)#12850
techknowlogick merged 2 commits into
go-gitea:release/v1.12from
zeripath:backport-12622

Conversation

@zeripath
Copy link
Copy Markdown
Contributor

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

Co-authored-by: mrsdizzie info@mrsdizzie.com
Co-authored-by: techknowlogick techknowlogick@gitea.io

Backport go-gitea#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

Co-authored-by: mrsdizzie <info@mrsdizzie.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
@zeripath zeripath added this to the 1.12.5 milestone Sep 15, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Sep 15, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 15, 2020
@6543
Copy link
Copy Markdown
Member

6543 commented Sep 15, 2020

🚀

@techknowlogick techknowlogick merged commit 3a02f08 into go-gitea:release/v1.12 Sep 15, 2020
@zeripath zeripath deleted the backport-12622 branch September 30, 2020 11:20
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants