gitea/routers/api/v1/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
..
blob.go Swagger info corrections (#9441) 2019-12-20 19:07:12 +02:00
branch.go [API] Add pagination to ListBranches (#14524) 2021-02-03 20:06:13 +01:00
collaborators.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
commits.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
file.go Add support for ref parameter to get raw file API (#14602) 2021-02-09 01:15:47 +01:00
fork.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
git_hook.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
git_ref.go Swagger info corrections (#9441) 2019-12-20 19:07:12 +02:00
hook.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
hook_test.go API endpoint for testing webhook (#3550) 2018-04-29 14:21:33 +08:00
issue.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
issue_comment.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
issue_label.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
issue_reaction.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
issue_stopwatch.go Refactor: move Commit To APIFormat Code & Lot of StopWatch related things (#12729) 2020-09-18 20:09:26 +08:00
issue_subscription.go [Refactor] Move APIFormat functions into convert package (#12856) 2020-10-17 00:23:08 -04:00
issue_tracked_time.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
key.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
label.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
language.go Add language statistics API endpoint (#11737) 2020-06-07 14:48:41 +03:00
main_test.go API endpoint for testing webhook (#3550) 2018-04-29 14:21:33 +08:00
migrate.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
milestone.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
mirror.go Refactor api repo dir (#10048) 2020-01-29 13:55:23 +08:00
pull.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
pull_review.go Add dismiss review feature (#12674) 2021-02-11 18:32:25 +01:00
release.go Create tag on ui (#13467) 2021-02-28 19:57:45 +00:00
release_attachment.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
release_tags.go [API] Add delete release by tag & fix unreleased inconsistency (#14563) 2021-02-07 19:32:18 +01:00
repo.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
repo_test.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
star.go Remove page size limit comment from swagger (#11806) 2020-06-09 00:57:38 -04:00
status.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
subscriber.go Remove page size limit comment from swagger (#11806) 2020-06-09 00:57:38 -04:00
tag.go [API] Add delete release by tag & fix unreleased inconsistency (#14563) 2021-02-07 19:32:18 +01:00
teams.go [API] List, Check, Add & delete endpoints for repository teams (#13630) 2021-02-01 22:57:12 +01:00
topic.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
transfer.go Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 2021-03-01 01:47:30 +01:00
tree.go Remove page size limit comment from swagger (#11806) 2020-06-09 00:57:38 -04:00