You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		4 years ago
..
labels	restrict query selector to edit form (#14307)	4 years ago
view_content	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago
branch_selector_field.tmpl	fix branch selector on new issue page (#14194)	4 years ago
choose.tmpl	Add class to page content to unify top margin (#13766)	4 years ago
comment_tab.tmpl	Attachments: Add extension support, allow all types for releases (#12465)	4 years ago
label_precolors.tmpl	Indent all templates with tabs	9 years ago
labels.tmpl	Add class to page content to unify top margin (#13766)	4 years ago
list.tmpl	Fix bug that username missed on issue list assignee filter (#14481)	4 years ago
milestone_issues.tmpl	Add review requested filter on pull request overview (#13701)	4 years ago
milestone_new.tmpl	Add class to page content to unify top margin (#13766)	4 years ago
milestones.tmpl	Add class to page content to unify top margin (#13766)	4 years ago
navbar.tmpl	Search bar for issues/pulls (#530)	8 years ago
new.tmpl	Add class to page content to unify top margin (#13766)	4 years ago
new_form.tmpl	Display current stopwatch in navbar (#14122)	4 years ago
openclose.tmpl	Markdown and Repo header tweaks (#13744)	4 years ago
search.tmpl	Disable search box autofocus on issue/pr pages (#12229)	4 years ago
view.tmpl	Add class to page content to unify top margin (#13766)	4 years ago
view_content.tmpl	Comment - Reference in new issue (#14366)	4 years ago
view_title.tmpl	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago