Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Escape more things that are passed through str2html #12622

Merged
merged 4 commits into from
Aug 28, 2020

Conversation

zeripath
Copy link
Contributor

Signed-off-by: Andrew Thornton [email protected]

templates/user/dashboard/feeds.tmpl Outdated Show resolved Hide resolved
templates/user/dashboard/feeds.tmpl Outdated Show resolved Hide resolved
templates/user/dashboard/feeds.tmpl Outdated Show resolved Hide resolved
templates/user/dashboard/feeds.tmpl Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 27, 2020
Co-authored-by: mrsdizzie <[email protected]>
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Aug 27, 2020
@codecov-commenter
Copy link

codecov-commenter commented Aug 27, 2020

Codecov Report

Merging #12622 into master will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #12622      +/-   ##
==========================================
+ Coverage   43.43%   43.44%   +0.01%     
==========================================
  Files         645      645              
  Lines       71306    71306              
==========================================
+ Hits        30972    30981       +9     
+ Misses      35323    35317       -6     
+ Partials     5011     5008       -3     
Impacted Files Coverage Δ
routers/user/oauth.go 42.81% <100.00%> (ø)
services/pull/pull.go 42.03% <0.00%> (+0.46%) ⬆️
modules/log/event.go 58.49% <0.00%> (+0.94%) ⬆️
modules/process/manager.go 75.00% <0.00%> (+2.50%) ⬆️
modules/util/timer.go 85.71% <0.00%> (+42.85%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cbc60f5...bd58ced. Read the comment docs.

routers/user/oauth.go Outdated Show resolved Hide resolved
@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 Aug 28, 2020
@techknowlogick techknowlogick merged commit d3b5eda into go-gitea:master Aug 28, 2020
@zeripath zeripath deleted the escape-before-str2html branch August 28, 2020 07:18
zeripath added a commit to zeripath/gitea that referenced this pull request Sep 15, 2020
Backport go-gitea#12622

* Escape more things that are passed through str2html

Signed-off-by: Andrew Thornton <[email protected]>

* Bloody editors!

Co-authored-by: mrsdizzie <[email protected]>

* Update routers/user/oauth.go

Co-authored-by: mrsdizzie <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
@zeripath zeripath added the backport/done All backports for this PR have been created label Sep 15, 2020
techknowlogick pushed a commit that referenced this pull request Sep 15, 2020
Backport #12622

* Escape more things that are passed through str2html

Signed-off-by: Andrew Thornton <[email protected]>

* Bloody editors!

Co-authored-by: mrsdizzie <[email protected]>

* Update routers/user/oauth.go
@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
backport/done All backports for this PR have been created 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