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