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

Prevent server 500 on compare branches with no common history (#6555) #6558

Merged
merged 2 commits into from
Apr 11, 2019

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Apr 9, 2019

  • Prevent 500 if there is no common mergebase
  • Prevent creation of PR with no history

Backport of #6555 to release/v1.8

…ea#6555)

* Prevent 500 if there is no common mergebase
* Prevent creation of PR with no history
@zeripath zeripath added this to the 1.8.0 milestone Apr 9, 2019
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 9, 2019
@zeripath
Copy link
Contributor Author

zeripath commented Apr 9, 2019

Fixes #6527 and probably others.

@zeripath
Copy link
Contributor Author

zeripath commented Apr 9, 2019

Ah damn! This PR changes the code in the old git project!

@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, 2019
@lunny
Copy link
Member

lunny commented Apr 10, 2019

CI failed.

@zeripath
Copy link
Contributor Author

Yeah we would need to resurrect the old git subproject, change it, update the Gitea 1.8 branch to use these changes and then try again.

I can probably make PRs for this this evening UK time if it's wanted - but the git project needs to be resurrected for me to put a pr against.

@zeripath
Copy link
Contributor Author

make LG-TM work?

@zeripath zeripath merged commit 245089b into go-gitea:release/v1.8 Apr 11, 2019
@zeripath zeripath deleted the backport-6555 branch April 11, 2019 20:31
@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
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.

7 participants