gitea/routers
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
..
admin Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
api/v1 Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
dev Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
events Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
org Organization removal confirmation using name not password (#14738) 2021-03-01 16:33:05 +02:00
private Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
repo Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
routes Add CORS config on to /login/oauth/access_token endpoint (#14850) 2021-03-04 03:25:30 +02:00
user Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
utils Clarify the suffices and prefixes of setting.AppSubURL and setting.AppURL (#12999) 2021-02-19 22:36:43 +01:00
home.go [Feature] add precise search type for Elastic Search (#12869) 2021-01-27 12:00:35 +02:00
init.go Print usefull error if SQLite is used in settings but not supported (#14476) 2021-01-27 04:57:18 +01:00
install.go Add Password Algorithm option to install page (#14701) 2021-02-16 23:37:20 +01:00
metrics.go Move metrics from macaron to chi (#13601) 2020-11-17 15:50:06 -05:00
swagger_json.go Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00