You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		4 years ago
..
check.go	Update mergebase in pr checker (#10586)	4 years ago
check_test.go	Only check for conflicts/merging if the PR has not been merged in the interim (#10132)	4 years ago
commit_status.go	Fix bug on pull view when required status check no ci result (#10648)	4 years ago
lfs.go	Add basic repository lfs management (#7199)	5 years ago
main_test.go	Move some pull request functions from models to services (#9266)	5 years ago
merge.go	Handle push rejection in branch and upload (#10854)	4 years ago
patch.go	Remove Unused Functions (#10516)	4 years ago
pull.go	Display pull request head branch even the branch deleted or repository deleted (#10413)	4 years ago
pull_test.go	Move PushToBaseRepo from models to services/pull (#9352)	5 years ago
review.go	Display pull request head branch even the branch deleted or repository deleted (#10413)	4 years ago
temp_repo.go	Display pull request head branch even the branch deleted or repository deleted (#10413)	4 years ago
update.go	Only check for conflicts/merging if the PR has not been merged in the interim (#10132)	4 years ago