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
diff	Make manual merge autodetection optional and add manual merge as merge method (#12543)	2021-03-03 22:41:23 -05:00
editor
graph
issue	Make manual merge autodetection optional and add manual merge as merge method (#12543)	2021-03-03 22:41:23 -05:00
migrate
projects
pulls
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
activity.tmpl
blame.tmpl
branch_dropdown.tmpl	Create tag on ui (#13467)	2021-02-28 19:57:45 +00:00
clone_buttons.tmpl
commit_page.tmpl
commit_status.tmpl
commit_statuses.tmpl
commits.tmpl
commits_list.tmpl
commits_list_small.tmpl
commits_table.tmpl
create.tmpl
empty.tmpl
forks.tmpl
graph.tmpl
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
icon.tmpl
search.tmpl
shabox_badge.tmpl
sub_menu.tmpl
upload.tmpl
user_cards.tmpl
view_file.tmpl
view_list.tmpl
watchers.tmpl