54 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	d92781bf94	Refactor repository check and sync functions (#9854) ... Move more general repository functions out of models/repo.go	2020-01-20 20:01:19 +00:00
zeripath	66ee9b87f9	Add require signed commit for protected branch (#9708) ... * Add require signed commit for protected branch * Fix fmt * Make editor show if they will be signed * bugfix * Add basic merge check and better information for CRUD * linting comment * Add descriptors to merge signing * Slight refactor * Slight improvement to appearances * Handle Merge API * manage CRUD API * Move error to error.go * Remove fix to delete.go * prep for merge * need to tolerate \r\n in message * check protected branch before trying to load it * Apply suggestions from code review Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> * fix commit-reader Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>	2020-01-15 09:32:57 +01:00
Lunny Xiao	b9309e52f0	Move wiki related funtions from models to services/wiki (#9355) ... * Move wiki related funtions from models to services/wiki	2020-01-07 18:27:36 +00:00