2 Commits

Author	SHA1	Message	Date
zeripath	7cd47046ea	Handle push rejection in branch and upload (#10854) ... * 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 Fix #10460 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>	2020-03-28 01:13:18 -03:00
Lunny Xiao	2677d071f9	Move newbranch to standalone package (#9627) ... * Move newbranch to standalone package * move branch functions to modules to avoid dependencies cycles * fix tests * fix lint * fix lint	2020-01-14 11:38:04 +08:00