Repository navigation
Handle push rejection in branch and upload - #10854
Merged
guillep2k merged 2 commits intoMar 28, 2020
Merged
Conversation
* Handle push rejections and push out-of-date in branch creation and file upload. * Remove the duplicated sanitize from services/pull/merge * Move the errors Err(Merge)PushOutOfDate and ErrPushRejected to modules/git * Handle errors better in the upload file dialogs Errors still need to be better handled in the API and the wiki but these can wait for another time. Fix go-gitea#10460 Signed-off-by: Andrew Thornton <art27@cantab.net>
lafriks
approved these changes
Mar 27, 2020
GiteaBot
added
the
lgtm/need 1
guillep2k
approved these changes
Mar 28, 2020
GiteaBot
added
lgtm/done
Member
|
Ping LG-TM |
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.
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.
Errors still need to be better handled in the API and the wiki but these can wait for another PR.
Fix #10460