You cannot 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>
3 years ago
..
blob.go Swagger info corrections (#9441) 5 years ago
branch.go [API] Add pagination to ListBranches (#14524) 3 years ago
collaborators.go Move macaron to chi (#14293) 3 years ago
commits.go Move macaron to chi (#14293) 3 years ago
file.go Add support for ref parameter to get raw file API (#14602) 3 years ago
fork.go Move macaron to chi (#14293) 3 years ago
git_hook.go Move macaron to chi (#14293) 3 years ago
git_ref.go Swagger info corrections (#9441) 5 years ago
hook.go Move macaron to chi (#14293) 3 years ago
hook_test.go API endpoint for testing webhook (#3550) 6 years ago
issue.go Move macaron to chi (#14293) 3 years ago
issue_comment.go Move macaron to chi (#14293) 3 years ago
issue_label.go Move macaron to chi (#14293) 3 years ago
issue_reaction.go Move macaron to chi (#14293) 3 years ago
issue_stopwatch.go Refactor: move Commit To APIFormat Code & Lot of StopWatch related things (#12729) 4 years ago
issue_subscription.go [Refactor] Move APIFormat functions into convert package (#12856) 4 years ago
issue_tracked_time.go Move macaron to chi (#14293) 3 years ago
key.go Move macaron to chi (#14293) 3 years ago
label.go Move macaron to chi (#14293) 3 years ago
language.go Add language statistics API endpoint (#11737) 4 years ago
main_test.go API endpoint for testing webhook (#3550) 6 years ago
migrate.go Move macaron to chi (#14293) 3 years ago
milestone.go Move macaron to chi (#14293) 3 years ago
mirror.go Refactor api repo dir (#10048) 5 years ago
pull.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 3 years ago
pull_review.go Add dismiss review feature (#12674) 3 years ago
release.go Create tag on ui (#13467) 3 years ago
release_attachment.go Move macaron to chi (#14293) 3 years ago
release_tags.go [API] Add delete release by tag & fix unreleased inconsistency (#14563) 3 years ago
repo.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 3 years ago
repo_test.go Move macaron to chi (#14293) 3 years ago
star.go Remove page size limit comment from swagger (#11806) 4 years ago
status.go Move macaron to chi (#14293) 3 years ago
subscriber.go Remove page size limit comment from swagger (#11806) 4 years ago
tag.go [API] Add delete release by tag & fix unreleased inconsistency (#14563) 3 years ago
teams.go [API] List, Check, Add & delete endpoints for repository teams (#13630) 3 years ago
topic.go Move macaron to chi (#14293) 3 years ago
transfer.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
tree.go Remove page size limit comment from swagger (#11806) 4 years ago