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

[BugFix] [API] Fix Squash Merge #11033

Merged
merged 3 commits into from
Apr 10, 2020

Conversation

6543
Copy link
Member

@6543 6543 commented Apr 10, 2020

you will get an 500 error if you try to merge a pull via squash merge option via API

this fix it

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 10, 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 Apr 10, 2020
@lafriks lafriks added this to the 1.12.0 milestone Apr 10, 2020
@lafriks lafriks merged commit d21b974 into go-gitea:master Apr 10, 2020
@lafriks lafriks deleted the fix-api-500-error-on-squash-merge branch April 10, 2020 10:40
@lafriks lafriks added the modifies/api This PR adds API routes or modifies them label Apr 10, 2020
@6543
Copy link
Member Author

6543 commented Apr 10, 2020

TESTED: this bug also afect v1.11 - sending backport ...

@6543
Copy link
Member Author

6543 commented Apr 10, 2020

Backport: #11039

@lafriks lafriks added the backport/done All backports for this PR have been created label Apr 10, 2020
guillep2k pushed a commit that referenced this pull request Apr 11, 2020
* Load pr Issue Poster on API too (#11033)

* ajust for 1.11 codebase
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 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.
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. modifies/api This PR adds API routes or modifies them type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants