Prevent server 500 on compare branches with no common history #6555
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I think 1.8 could do with this too. It's far too easy to get a 500 with this endpoint. |
|
@zeripath I am not 100% sure about a backport of this due to new translation being required (usually translations aren't backported), although I do like that this prevents 500s. If anyone else has feedback on being pro/anti backport please add it to this PR. |
lafriks
approved these changes
Apr 9, 2019
Codecov Report
@@ Coverage Diff @@
## master #6555 +/- ##
==========================================
- Coverage 40.36% 40.35% -0.01%
==========================================
Files 405 405
Lines 54255 54260 +5
==========================================
- Hits 21900 21899 -1
- Misses 29340 29347 +7
+ Partials 3015 3014 -1
Continue to review full report at Codecov.
|
|
I'm for backport as it is better to get error in English than get 500 page |
jolheiser
approved these changes
Apr 9, 2019
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Apr 9, 2019
…ea#6555) * Prevent 500 if there is no common mergebase * Prevent creation of PR with no history
zeripath
added a commit
to zeripath/git
that referenced
this pull request
Apr 11, 2019
zeripath
added a commit
to go-gitea/git
that referenced
this pull request
Apr 11, 2019
zeripath
added a commit
that referenced
this pull request
Apr 11, 2019
|
Backport done and merged. |
4 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR prevents the compare branch from sending a server 500 if there is no common history between branches. Instead it presents a simple compare page.
Fixes #6527 and probably others.