forgejo/routers/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
..
activity.go Add top author stats to activity page (#9615) 2020-01-20 12:07:30 +02:00
attachment.go Add Content-Length header to HEAD requests (#14542) 2021-02-05 21:10:40 +01:00
blame.go Show dropdown with all statuses for commit (#13977) 2020-12-20 11:13:12 +08:00
branch.go Create tag on ui (#13467) 2021-02-28 19:57:45 +00:00
commit.go Whitespace in commits (#14650) 2021-02-13 05:35:43 +01:00
compare.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
download.go Add Content-Length header to HEAD requests (#14542) 2021-02-05 21:10:40 +01:00
editor.go Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
editor_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
http.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
issue.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
issue_dependency.go Fix wrong permissions check when issues/prs shared operations (#9885) 2020-01-20 13:00:32 +01:00
issue_label.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
issue_label_test.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
issue_lock.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
issue_stopwatch.go Display current stopwatch in navbar (#14122) 2021-01-21 15:51:52 +01:00
issue_test.go Refactor combine label comments with tests (#13619) 2020-11-20 17:29:09 -05:00
issue_timetrack.go Add UI to delete tracked times (#14100) 2021-02-19 12:52:11 +02:00
issue_watch.go Fix PR/issue redirects when having external tracker (#9339) 2019-12-14 01:53:32 +01:00
lfs.go Display SVG files as images instead of text (#14101) 2021-01-12 22:45:19 -05:00
main_test.go Unit tests for wiki routers (#3022) 2017-11-30 17:52:15 +02:00
middlewares.go Add gitea-vet (#10948) 2020-04-05 07:20:50 +01: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
projects.go Sort / Move project boards (#14634) 2021-02-11 17:32:27 +01:00
projects_test.go KanBan: be able to set default board (#14147) 2021-01-15 22:29:32 +02: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_test.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
repo.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
search.go Clarify the suffices and prefixes of setting.AppSubURL and setting.AppURL (#12999) 2021-02-19 22:36:43 +01:00
setting.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
setting_protected_branch.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
settings_test.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
topic.go Add API endpoint for accessing repo topics (#7963) 2019-09-03 23:46:24 +08:00
view.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
webhook.go Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
wiki.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
wiki_test.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00