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.

Sign up for GitHub

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

Jump to bottom

Handle push rejection in branch and upload #10854

Merged
merged 2 commits into from
Mar 28, 2020
Merged

Handle push rejection in branch and upload #10854

merged 2 commits into from
Mar 28, 2020

Commits on Mar 27, 2020

  1. Handle push rejection in branch and upload 

    * 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 <[email protected]>
    @zeripath
    zeripath committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    57d08a3 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2020

  1. Merge branch 'master' into handle-push-rejection-properly

    @guillep2k
    guillep2k committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    bb10958 View commit details
    Browse the repository at this point in the history