forgejo/templates
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>
2021-03-03 22:41:23 -05:00
..
admin Added option to disable webhooks (#13176) 2021-02-11 12:34:34 -05:00
base Fix dashboard UI bugs and more (#14767) 2021-02-25 13:35:43 +01:00
custom Add footer extra links template (#9576) 2020-01-03 20:41:56 +02:00
explore [Feature] add precise search type for Elastic Search (#12869) 2021-01-27 12:00:35 +02:00
mail Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 2021-03-01 01:47:30 +01:00
org Organization removal confirmation using name not password (#14738) 2021-03-01 16:33:05 +02:00
repo Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
shared Improve label and text wrapping (#14113) 2020-12-29 18:48:28 -05:00
status Style and template tweaks (#13828) 2020-12-04 12:18:37 +01:00
swagger Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
user Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 2021-03-01 01:47:30 +01:00
home.tmpl Consolidate Logos and update README header (#14136) 2021-01-01 14:04:35 -05:00
install.tmpl Add Password Algorithm option to install page (#14701) 2021-02-16 23:37:20 +01:00
post-install.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00