forgejo-federation/modules/forms
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.go Move middlewares to web/middleware (#14480) 2021-01-30 10:55:53 +02:00
auth_form.go Move middlewares to web/middleware (#14480) 2021-01-30 10:55:53 +02:00
org.go Move middlewares to web/middleware (#14480) 2021-01-30 10:55:53 +02:00
repo_branch_form.go Create tag on ui (#13467) 2021-02-28 19:57:45 +00:00
repo_form.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
repo_form_test.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
user_form.go Add Password Algorithm option to install page (#14701) 2021-02-16 23:37:20 +01:00
user_form_auth_openid.go Move middlewares to web/middleware (#14480) 2021-01-30 10:55:53 +02:00
user_form_test.go Allow blocking some email domains from registering an account (#14667) 2021-02-15 00:31:29 +01:00