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
..
analyze	Exclude generated files from language statistics (#11653)	2020-05-29 09:20:01 +03:00
auth	Move middlewares to web/middleware (#14480)	2021-01-30 10:55:53 +02:00
avatar	Avatars and Repo avatars support storing in minio (#12516)	2020-10-14 21:07:51 +08:00
base	Add some Unit-Tests (#14500)	2021-01-28 19:08:11 +01:00
cache	[Vendor] Update go-redis to v8.5.0 (#13749)	2021-02-10 21:28:32 +00:00
charset	Ensure that the detected charset order is set in chardet test (#12574)	2020-08-23 14:15:29 +01:00
context	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
convert	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	2021-03-01 01:47:30 +01:00
cron	Cron job to cleanup hook_task table (#13080)	2021-01-26 22:02:42 +01:00
doctor	Prevent adding nil label to .AddedLabels or .RemovedLabels (#14623)	2021-02-10 10:50:44 +08:00
emoji	Fix emoji detection in certain cases (#12320)	2020-07-25 16:40:04 +03:00
eventsource	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
forms	Make manual merge autodetection optional and add manual merge as merge method (#12543)	2021-03-03 22:41:23 -05:00
generate	Add gitea-vet (#10948)	2020-04-05 07:20:50 +01:00
git	Make manual merge autodetection optional and add manual merge as merge method (#12543)	2021-03-03 22:41:23 -05:00
gitgraph	[Refactor] CombinedStatus and CommitStatus related functions & structs (#14026)	2020-12-18 11:33:32 +08:00
graceful	Fix windows build error (#14263)	2021-01-06 09:38:00 +08:00
hcaptcha	hCaptcha Support (#12594)	2020-10-02 23:37:53 -04:00
highlight	Use existing analyzer module for language detection for highlighting (#13522)	2020-11-13 16:13:41 -05:00
httpcache	Use IsProd instead of testing if it's equal. (#14336)	2021-01-14 23:17:03 +02:00
httplib	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
indexer	Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781)	2021-03-03 21:57:01 -05:00
lfs	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
log	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
markup	Clarify the suffices and prefixes of setting.AppSubURL and setting.AppURL (#12999)	2021-02-19 22:36:43 +01:00
matchlist	Add Allow-/Block-List for Migrate & Mirrors (#13610)	2020-11-28 19:37:58 -05:00
metrics	Prometheus endpoint (#5256)	2018-11-04 22:20:00 -05:00
migrations	Fix a couple of CommentAsPatch issues. (#14804)	2021-02-27 19:46:14 +01:00
nosql	[Vendor] Update go-redis to v8.5.0 (#13749)	2021-02-10 21:28:32 +00:00
notification	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
options	Add StatDir and replace com.StatDir (#14099)	2020-12-22 07:40:57 +08:00
password	Check passwords against HaveIBeenPwned (#12716)	2020-09-08 17:06:39 -05:00
pprof	Add golangci (#6418)	2019-06-12 15:41:28 -04:00
private	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
process	Reduce data races (#14549)	2021-02-03 22:36:38 +01:00
public	Update docs and comments to remove macaron (#14491)	2021-01-29 16:35:30 +01:00
queue	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
recaptcha	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
references	Add mentionable teams to tributeValues and change team mention rules to gh's style (#13198)	2020-12-21 16:39:28 +01:00
repofiles	remove duplicate define of CheckAttribute() (#14837)	2021-03-01 14:14:17 +02:00
repository	Ensure memcache TTL cannot be over 30 days (#14592)	2021-02-09 22:29:03 +00:00
secret	Attachments: Add extension support, allow all types for releases (#12465)	2020-10-05 01:49:33 -04:00
session	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
setting	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
ssh	Internal ssh server respect Ciphers, MACs and KeyExchanges settings (#14523)	2021-01-30 14:20:32 +01:00
storage	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
structs	Make manual merge autodetection optional and add manual merge as merge method (#12543)	2021-03-03 22:41:23 -05:00
svg	Fix filepath basename on Windows for SVG bindata (#12241)	2020-07-13 21:16:40 +01:00
sync	Fix missing unlock in uniquequeue (#9790)	2020-01-15 23:58:33 +02:00
task	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
templates	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
test	Move middlewares to web/middleware (#14480)	2021-01-30 10:55:53 +02:00
timeutil	Fix display since time round (#14226)	2021-01-28 13:29:22 +01:00
translation	Fix locale init (#14582)	2021-02-05 22:41:45 +01:00
upload	Update golangci-lint to version 1.31.0 (#13102)	2020-10-11 21:27:20 +01:00
uri	Dump github/gitlab/gitea repository data to a local directory and restore to gitea (#12244)	2020-12-27 11:34:19 +08:00
user	Add gitea-vet (#10948)	2020-04-05 07:20:50 +01:00
util	[API] Add pagination to ListBranches (#14524)	2021-02-03 20:06:13 +01:00
validation	Move macaron to chi (#14293)	2021-01-26 16:36:53 +01:00
web	Move middlewares to web/middleware (#14480)	2021-01-30 10:55:53 +02:00