forgejo/templates/repo
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
..
branch Add pager to the branches page (#14202) 2021-01-19 05:07:38 +01:00
diff Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
editor enhancement: add signoff option in commit form (#14516) 2021-01-29 16:57:45 +08:00
graph Direct avatar rendering (#13649) 2020-12-03 19:46:11 +01:00
issue Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
migrate Fix truncated organization names (#14655) 2021-02-12 03:29:07 +02:00
projects Sort / Move project boards (#14634) 2021-02-11 17:32:27 +01:00
pulls Fix truncated organization names (#14655) 2021-02-12 03:29:07 +02:00
release Create tag on ui (#13467) 2021-02-28 19:57:45 +00:00
settings Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
wiki add preview support for wiki editor when disable simpleMDE (#14757) 2021-02-28 16:48:29 +00:00
activity.tmpl Fix missleading sentence (#14829) 2021-02-28 07:54:12 +00:00
blame.tmpl Fix whitespace rendering in diff (#13415) 2020-11-04 09:14:07 +02:00
branch_dropdown.tmpl Create tag on ui (#13467) 2021-02-28 19:57:45 +00:00
clone_buttons.tmpl Consolidate clone button templates (#14023) 2020-12-28 13:30:06 -05:00
commit_page.tmpl Show dropdown with all statuses for commit (#13977) 2020-12-20 11:13:12 +08:00
commit_status.tmpl Show dropdown with all statuses for commit (#13977) 2020-12-20 11:13:12 +08:00
commit_statuses.tmpl Show dropdown with all statuses for commit (#13977) 2020-12-20 11:13:12 +08:00
commits.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
commits_list.tmpl Show dropdown with all statuses for commit (#13977) 2020-12-20 11:13:12 +08:00
commits_list_small.tmpl Show dropdown with all statuses for commit (#13977) 2020-12-20 11:13:12 +08:00
commits_table.tmpl Fix tooltips and issue dependency styles (#13458) 2020-11-10 20:28:07 +02:00
create.tmpl Add helper descriptions on new repo page (#14591) 2021-02-21 17:59:31 +08:00
empty.tmpl Consolidate clone button templates (#14023) 2020-12-28 13:30:06 -05:00
forks.tmpl Direct avatar rendering (#13649) 2020-12-03 19:46:11 +01:00
graph.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
header.tmpl 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 clone button templates (#14023) 2020-12-28 13:30:06 -05:00
icon.tmpl Do not display org avatar near icon for internal repos (#13957) 2020-12-13 16:51:15 -05:00
search.tmpl [Feature] add precise search type for Elastic Search (#12869) 2021-01-27 12:00:35 +02:00
shabox_badge.tmpl Fix avatar template error (#13833) 2020-12-03 23:12:59 +00:00
sub_menu.tmpl Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
upload.tmpl Fix attachments list in edit comment (#13036) 2020-10-11 00:49:59 +01:00
user_cards.tmpl Direct avatar rendering (#13649) 2020-12-03 19:46:11 +01:00
view_file.tmpl Display SVG files as images instead of text (#14101) 2021-01-12 22:45:19 -05:00
view_list.tmpl Show dropdown with all statuses for commit (#13977) 2020-12-20 11:13:12 +08:00
watchers.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00