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.

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

Account for empty lines in receive-hook message #10773

Merged
merged 3 commits into from
Mar 20, 2020
Merged

Account for empty lines in receive-hook message #10773

merged 3 commits into from
Mar 20, 2020

Conversation

zeripath
Copy link
Contributor

There is a bug with the remote message parsing in #10373 which leads to empty lines in remote messages being mishandled.

This PR fixes this.

@zeripath zeripath added this to the 1.12.0 milestone Mar 19, 2020
@zeripath
Copy link
Contributor Author

@mshgh this should fix new line issue

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 19, 2020
@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 Mar 20, 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 Mar 20, 2020
@lafriks lafriks merged commit b3f4f81 into go-gitea:master Mar 20, 2020
@lafriks
Copy link
Member

lafriks commented Mar 20, 2020

Please send backport

zeripath added a commit to zeripath/gitea that referenced this pull request Mar 20, 2020
@zeripath @lunny @jolheiser
account for empty lines in receive-hook message (go-gitea#10773)
eb2e655 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
@zeripath zeripath mentioned this pull request Mar 20, 2020
Merged
@zeripath zeripath deleted the fix-again-10322 branch March 20, 2020 18:43
@lafriks lafriks added the backport/done All backports for this PR have been created label Mar 20, 2020
lunny added a commit that referenced this pull request Mar 21, 2020
@zeripath @lunny
@jolheiser @lafriks
account for empty lines in receive-hook message (#10773) (#10784)
6ee6731 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
@zeripath zeripath changed the title account for empty lines in receive-hook message Account for empty lines in receive-hook message Apr 1, 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

@lunny lunny lunny approved these changes

@lafriks lafriks lafriks approved these changes

@mrsdizzie mrsdizzie mrsdizzie approved these changes

Assignees
No one assigned
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
Milestone
1.12.0
Development

Successfully merging this pull request may close these issues.
6 participants
@zeripath @lafriks @lunny @mrsdizzie @GiteaBot @jolheiser