Skip to content

Add better error checking for inline html diff code #13251

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Oct 22, 2020
Merged

Add better error checking for inline html diff code #13251

merged 2 commits into from
Oct 22, 2020

Conversation

@mrsdizzie
Copy link
Member

@mrsdizzie mrsdizzie commented Oct 21, 2020

Backport to 1.13

mrsdizzie and others added 2 commits October 21, 2020 18:40
@mrsdizzie @zeripath
Fix error in diff html rendering (go-gitea#13191)
bce70c7 
* Fix error in diff html rendering

Was missing an optional whitespace check in regex. Also noticed a rare case where diff.Type == Equal would be empty and thus get a newline attached. Fixed that too.

Fixes go-gitea#13177

* Update services/gitdiff/gitdiff.go

Co-authored-by: zeripath <art27@cantab.net>

* Update gitdiff_test.go

* fmt

Co-authored-by: zeripath <art27@cantab.net>
@mrsdizzie @techknowlogick
Add better error checking for inline html diff code (go-gitea#13239)
decfb14 
* Add better error checking for inline html diff code

A better fix for go-gitea#13191 which cleans up this code a bit and adds basic checking which should avoid writing broken HTML in future situations.

* Update gitdiff_test.go

* better regex

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 21, 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 21, 2020
@mrsdizzie mrsdizzie added this to the 1.13.0 milestone Oct 21, 2020
@techknowlogick techknowlogick added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Oct 21, 2020
@techknowlogick techknowlogick merged commit 52d333f into go-gitea:release/v1.13 Oct 22, 2020
@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.

Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

+1 more reviewer

@zeripath zeripath zeripath approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug

Projects

None yet

Milestone

1.13.0

Development

Successfully merging this pull request may close these issues.

4 participants

@mrsdizzie @techknowlogick @zeripath @GiteaBot