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.

zeripath 8598356df1 Refactor and tidy-up the merge/update branch code (#22568) ... The merge and update branch code was previously a little tangled and had some very long functions. The functions were not very clear in their reasoning and there were deficiencies in their logging and at least one bug in the handling of LFS for update by rebase. This PR substantially refactors this code and splits things out to into separate functions. It also attempts to tidy up the calls by wrapping things in "context"s. There are also attempts to improve logging when there are errors. Signed-off-by: Andrew Thornton <art27@cantab.net> --------- Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: delvh <dev.lh@web.de>		1 year ago
..
actions	Fix actions workflow branches match bug (#22724)	1 year ago
activitypub	Add Chef package registry (#22554)	1 year ago
analyze	Implement FSFE REUSE for golang files (#21840)	2 years ago
auth	Fix various bugs for "install" page (#23194)	1 year ago
avatar	Use minio/sha256-simd for accelerated SHA256 (#23052)	1 year ago
base	Use minio/sha256-simd for accelerated SHA256 (#23052)	1 year ago
cache	Add context cache as a request level cache (#22294)	1 year ago
charset	Fix isAllowed of escapeStreamer (#22814)	1 year ago
container	Implement FSFE REUSE for golang files (#21840)	2 years ago
context	Use minio/sha256-simd for accelerated SHA256 (#23052)	1 year ago
csv	Add context when rendering labels or emojis (#23281)	1 year ago
doctor	Refactor `setting.Database.UseXXX` to methods (#23354)	1 year ago
emoji	Fix unstable emoji sort (#22346)	2 years ago
eventsource	Move `convert` package to services (#22264)	2 years ago
generate	Implement FSFE REUSE for golang files (#21840)	2 years ago
git	Refactor and tidy-up the merge/update branch code (#22568)	1 year ago
gitgraph	Add context cache as a request level cache (#22294)	1 year ago
graceful	Implement FSFE REUSE for golang files (#21840)	2 years ago
hcaptcha	Consume hcaptcha and pwn deps (#22610)	1 year ago
highlight	Refactor the setting to make unit test easier (#22405)	1 year ago
hostmatcher	Implement FSFE REUSE for golang files (#21840)	2 years ago
html	Implement FSFE REUSE for golang files (#21840)	2 years ago
httpcache	Add some comments for recent code (#22725)	1 year ago
httplib	Implement FSFE REUSE for golang files (#21840)	2 years ago
indexer	Refactor the setting to make unit test easier (#22405)	1 year ago
issue/template	Allow issue templates to not render title (#22589)	1 year ago
json	Update gitea-vet to check FSFE REUSE (#22004)	2 years ago
label	Add loading yaml label template files (#22976)	1 year ago
lfs	Use minio/sha256-simd for accelerated SHA256 (#23052)	1 year ago
log	Improve trace logging for pulls and processes (#22633)	1 year ago
markup	Add context when rendering labels or emojis (#23281)	1 year ago
mcaptcha	Implement FSFE REUSE for golang files (#21840)	2 years ago
metrics	include build info in Prometheus metrics (#22819)	1 year ago
migration	Scoped labels (#22585)	1 year ago
mirror	Implement FSFE REUSE for golang files (#21840)	2 years ago
nosql	Implement FSFE REUSE for golang files (#21840)	2 years ago
notification	Implement actions (#21937)	1 year ago
options	Add loading yaml label template files (#22976)	1 year ago
packages	Use import of OCI structs (#22765)	1 year ago
paginator	Update gitea-vet to check FSFE REUSE (#22004)	2 years ago
pprof	Implement FSFE REUSE for golang files (#21840)	2 years ago
private	Implement actions (#21937)	1 year ago
process	Improve trace logging for pulls and processes (#22633)	1 year ago
proxy	Use proxy for pull mirror (#22771)	1 year ago
proxyprotocol	Implement FSFE REUSE for golang files (#21840)	2 years ago
public	Implement FSFE REUSE for golang files (#21840)	2 years ago
queue	Properly flush unique queues on startup (#23154)	1 year ago
recaptcha	Implement FSFE REUSE for golang files (#21840)	2 years ago
references	Use correct captured group range when parsing cross-reference (#22672)	1 year ago
regexplru	Implement FSFE REUSE for golang files (#21840)	2 years ago
repository	Add loading yaml label template files (#22976)	1 year ago
secret	Use minio/sha256-simd for accelerated SHA256 (#23052)	1 year ago
session	Update gitea-vet to check FSFE REUSE (#22004)	2 years ago
setting	Refactor `setting.Database.UseXXX` to methods (#23354)	1 year ago
sitemap	Fix sitemap (#22272)	2 years ago
ssh	Implement FSFE REUSE for golang files (#21840)	2 years ago
storage	Add InsecureSkipVerify to Minio Client for Storage (#23166)	1 year ago
structs	Add scopes to API to create token and display them (#22989)	1 year ago
svg	Implement FSFE REUSE for golang files (#21840)	2 years ago
sync	Implement FSFE REUSE for golang files (#21840)	2 years ago
system	Implement FSFE REUSE for golang files (#21840)	2 years ago
templates	Add context when rendering labels or emojis (#23281)	1 year ago
test	Rename `repo.GetOwner` to `repo.LoadOwner` (#22967)	1 year ago
timeutil	Check for zero time instant in `TimeStamp.IsZero()` (#22171)	2 years ago
translation	Implement FSFE REUSE for golang files (#21840)	2 years ago
turnstile	Add new captcha: cloudflare turnstile (#22369)	1 year ago
typesniffer	Fix various ImageDiff/SVG bugs (#23312)	1 year ago
updatechecker	Implement FSFE REUSE for golang files (#21840)	2 years ago
upload	Implement FSFE REUSE for golang files (#21840)	2 years ago
uri	Implement FSFE REUSE for golang files (#21840)	2 years ago
user	Implement FSFE REUSE for golang files (#21840)	2 years ago
util	Use minio/sha256-simd for accelerated SHA256 (#23052)	1 year ago
validation	Map OIDC groups to Orgs/Teams (#21441)	1 year ago
watcher	Implement FSFE REUSE for golang files (#21840)	2 years ago
web	Map OIDC groups to Orgs/Teams (#21441)	1 year ago
webhook	Restructure `webhook` module (#22256)	2 years ago