Skip to content

Upgrade to bluemonday 1.0.7 #15379

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

Merged
merged 4 commits into from
Apr 9, 2021
Merged

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Apr 9, 2021

Fix #15349

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

Fix go-gitea#15349

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath added this to the 1.15.0 milestone Apr 9, 2021
zeripath added a commit to zeripath/gitea that referenced this pull request Apr 9, 2021
@zeripath zeripath added the backport/done All backports for this PR have been created label Apr 9, 2021
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 9, 2021
@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 Apr 9, 2021
@techknowlogick
Copy link
Member

CI Fail:

--- FAIL: TestRender_links (0.01s)
41    html_test.go:95: 
42        	Error Trace:	html_test.go:95
43        	            				html_test.go:125
44        	Error:      	Not equal: 
45        	            	expected: "<p><a href=\"https://www.example.com/foo/?bar=baz&inga=42&quux=\" rel=\"nofollow\">https://www.example.com/foo/?bar=baz&amp;inga=42&amp;quux</a></p>"
46        	            	actual  : "<p><a href=\"https://www.example.com/foo/?bar=baz&inga=42&quux\" rel=\"nofollow\">https://www.example.com/foo/?bar=baz&amp;inga=42&amp;quux</a></p>"
47        	            	
48        	            	Diff:
49        	            	--- Expected
50        	            	+++ Actual
51        	            	@@ -1 +1 @@
52        	            	-<p><a href="https://www.example.com/foo/?bar=baz&inga=42&quux=" rel="nofollow">https://www.example.com/foo/?bar=baz&amp;inga=42&amp;quux</a></p>
53        	            	+<p><a href="https://www.example.com/foo/?bar=baz&inga=42&quux" rel="nofollow">https://www.example.com/foo/?bar=baz&amp;inga=42&amp;quux</a></p>
54        	Test:       	TestRender_links
55FAIL

@zeripath
Copy link
Contributor Author

zeripath commented Apr 9, 2021

Oh bollox.

Well I think that's an example where the test is wrong. Should be a quick fix - but I'm currently in bed so if you'd like to push the fix feel free.

@techknowlogick
Copy link
Member

@zeripath lol, I pushed the fix prior to your comment. If the CI passes I will merge this and cherrypick to backport as well.

@techknowlogick techknowlogick merged commit b9ed3cb into go-gitea:master Apr 9, 2021
techknowlogick added a commit that referenced this pull request Apr 9, 2021
* Upgrade to bluemonday 1.0.7 (#15379)

Backport #15379

Fix #15349

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

* resolve CI

Co-authored-by: techknowlogick <[email protected]>
@zeripath zeripath deleted the bluemonday-1.0.7 branch April 10, 2021 06:10
@go-gitea go-gitea locked and limited conversation to collaborators May 13, 2021
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.

Question mark in URL renders as broken link in Markdown
4 participants