This repository has been archived on 2024-01-04. You can view files and clone it, but cannot push or open issues or pull requests.
forgejo/templates/repo/settings
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
..
webhook Merge default and system webhooks under one menu (#14244) 2021-01-15 01:24:03 +02:00
branches.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
collaboration.tmpl Direct avatar rendering (#13649) 2020-12-03 19:46:11 +01:00
deploy_keys.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
githook_edit.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
githooks.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
lfs.tmpl Style and template tweaks (#13828) 2020-12-04 12:18:37 +01:00
lfs_file.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
lfs_file_find.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
lfs_locks.tmpl Direct avatar rendering (#13649) 2020-12-03 19:46:11 +01:00
lfs_pointers.tmpl Replace more icons with SVG, repo search tweaks (#13860) 2020-12-09 14:03:19 -05:00
nav.tmpl Added option to disable webhooks (#13176) 2021-02-11 12:34:34 -05:00
navbar.tmpl Added option to disable webhooks (#13176) 2021-02-11 12:34:34 -05:00
options.tmpl Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
protected_branch.tmpl Direct avatar rendering (#13649) 2020-12-03 19:46:11 +01:00