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

When creating line diffs do not split within an html entity (#13357) #13375

Merged
merged 1 commit into from
Oct 31, 2020

Conversation

zeripath
Copy link
Contributor

Backport #13357

  • When creating line diffs do not split within an html entity

Fix #13342

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

  • Add test case

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

  • improve test

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

Co-authored-by: techknowlogick techknowlogick@gitea.io

…#13357)

Backport go-gitea#13357

* When creating line diffs do not split within an html entity

Fix go-gitea#13342

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

* Add test case

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

* improve test

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

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
@zeripath zeripath added this to the 1.13.0 milestone Oct 31, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 31, 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 Oct 31, 2020
@lafriks lafriks merged commit 3f94dff into go-gitea:release/v1.13 Oct 31, 2020
@zeripath zeripath deleted the backport-13357 branch October 31, 2020 19:33
@go-gitea go-gitea locked and limited conversation to collaborators Dec 14, 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