aiforge

Tree: df83c19df1

History

a1012112796 fb6eaa5a71 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
..
v1	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago

a1012112796 fb6eaa5a71 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

..

v1

Make manual merge autodetection optional and add manual merge as merge method (#12543)

4 years ago

No Description

Go SVG JavaScript Vue Roff other

u@gogs.io teabot@gitea.io xiaolunwen@gmail.com art27@cantab.net joe2010xtmf@163.com me@silverwind.io 6543@obermui.de lauris@nix.lv sapk@users.noreply.github.com etk39@cornell.edu fuxiaohei@hexiaz.com andrey.nering@gmail.com thomas@webhippie.de ethantkoenig@gmail.com strk@kbt.io 42128690+jolheiser@users.noreply.github.com techknowlogick@gitea.io vslene@gmail.com 1447794+CirnoT@users.noreply.github.com appleboy.tw@gmail.com 18600385+guillep2k@users.noreply.github.com info@mrsdizzie.com kim.carlbacker@gmail.com adelowomailbox@gmail.com bouwko@gmail.com

Contributors (25+) All

Contributors (25+)
All