gitea

Commit Graph

Author	SHA1	Message	Date
a1012112796	a5279b74b6	Make manual merge autodetection optional and add manual merge as merge method (#12543 ) * Make auto check manual merge as a chooseable mod and add manual merge way on ui as title, Before this pr, we use same way with GH to check manually merge. It good, but in some special cases, misjudgments can occur. and it's hard to fix this bug. So I add option to allow repo manager block "auto check manual merge" function, Then it will have same style like gitlab(allow empty pr). and to compensate for not being able to detect THE PR merge automatically, I added a manual approach. Signed-off-by: a1012112796 <1012112796@qq.com> * make swager * api support * ping ci * fix TestPullCreate_EmptyChangesWithCommits * Apply suggestions from code review Co-authored-by: zeripath <art27@cantab.net> * Apply review suggestions and add test * Apply suggestions from code review Co-authored-by: zeripath <art27@cantab.net> * fix build * test error message * make fmt * Fix indentation issues identified by @silverwind Co-authored-by: silverwind <me@silverwind.io> * Fix tests and make manually merged disabled error on API the same Signed-off-by: Andrew Thornton <art27@cantab.net> * a small nit * fix wrong commit id error * fix bug * simple test * fix test Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io>	4 years ago
zeripath	722a7c902d	Add Close() method to gogitRepository (#8901 ) In investigating #7947 it has become clear that the storage component of go-git repositories needs closing. This PR adds this Close function and adds the Close functions as necessary. In TransferOwnership the ctx.Repo.GitRepo is closed if it is open to help prevent the risk of multiple open files. Fixes #7947	5 years ago
zeripath	7ad67109d7	Be more strict with git arguments (#7715 ) * Be more strict with git arguments * fix-up commit test * use bindings for branch name	5 years ago
Christian Muehlhaeuser	5e4e7d3df0	Added missing error checks in tests (#7554 ) Whenever we assign a value to err, check for it being nil.	5 years ago
Lunny Xiao	d578b71d61	move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364 ) * move code.gitea.io/git to code.gitea.io/gitea/modules/git * fix imports * fix fmt * fix misspell * remove wrong tests data * fix unit tests * fix tests * fix tests * fix tests * fix tests * fix tests * enable Debug to trace the failure tests * fix tests * fix tests * fix tests * fix tests * fix tests * comment commit count tests since git clone depth is 50 * fix tests * update from code.gitea.io/git * revert change to makefile	6 years ago

5 Commits (f75a9b27b0fe291274e8ccd43d2cf7b88375519a)