Report error if API merge is not allowed#12528
Merged
techknowlogick merged 3 commits intoAug 19, 2020
Merged
Conversation
go-gitea#12496 demonstrated that the API merge needs to return some information as to why a merge has been disallowed with a status code 422. This PR ensures that a reason is always returned. Signed-off-by: Andrew Thornton <art27@cantab.net>
Codecov Report
@@ Coverage Diff @@
## master #12528 +/- ##
==========================================
- Coverage 43.50% 43.48% -0.03%
==========================================
Files 642 642
Lines 71003 71009 +6
==========================================
- Hits 30892 30879 -13
- Misses 35105 35117 +12
- Partials 5006 5013 +7
Continue to review full report at Codecov.
|
GiteaBot
added
the
lgtm/need 2
lunny
approved these changes
Aug 19, 2020
GiteaBot
added
lgtm/need 1
6543
approved these changes
Aug 19, 2020
GiteaBot
added
lgtm/done
lafriks
approved these changes
Aug 19, 2020
Member
|
🚀 |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
8 participants
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.
#12496 demonstrated that the API merge needs to return some information as
to why a merge has been disallowed with a status code 422.
This PR ensures that a reason is always returned.
Signed-off-by: Andrew Thornton art27@cantab.net