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.

Gusted ebe569a268 Set correct PR status on 3way on conflict checking (#19457) ... * Set correct PR status on 3way on conflict checking - When 3-way merge is enabled for conflict checking, it has a new interesting behavior that it doesn't return any error when it found a conflict, so we change the condition to not check for the error, but instead check if conflictedfiles is populated, this fixes a issue whereby PR status wasn't correctly on conflicted PR's. - Refactor the mergeable property(which was incorrectly set and lead me this bug) to be more maintainable. - Add a dedicated test for conflicting checking, so it should prevent future issues with this. * Fix linter		2 years ago
..
activitypub	format with gofumpt (#18184)	2 years ago
analyze	Use git attributes to determine generated and vendored status for language stats and diffs (#16773)	3 years ago
appstate	Use a struct as test options (#19393)	2 years ago
auth	RSS/Atom support for Repos (#19055)	2 years ago
avatar	format with gofumpt (#18184)	2 years ago
base	Update JS dependencies (#19281)	2 years ago
cache	Remove legacy `unknwon/com` package (#19298)	2 years ago
charset	Don't treat BOM escape sequence as hidden character. (#18909)	2 years ago
container	Move reaction to models/issues/ (#19264)	2 years ago
context	RepoAssignment ensure to close before overwrite (#19449)	2 years ago
convert	Set correct PR status on 3way on conflict checking (#19457)	2 years ago
csv	format with gofumpt (#18184)	2 years ago
doctor	Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)	2 years ago
emoji	format with gofumpt (#18184)	2 years ago
eventsource	Add Goroutine stack inspector to admin/monitor (#19207)	2 years ago
generate	Use base32 for 2FA scratch token (#18384)	2 years ago
git	Add uploadpack.allowAnySHA1InWant to allow --filter=blob:none with older git clients (#19430)	2 years ago
gitgraph	Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)	2 years ago
graceful	Add Goroutine stack inspector to admin/monitor (#19207)	2 years ago
hcaptcha	hCaptcha Support (#12594)	4 years ago
highlight	format with gofumpt (#18184)	2 years ago
hostmatcher	remove not needed (#19128)	2 years ago
httpcache	format with gofumpt (#18184)	2 years ago
httplib	refactor httplib (#18338)	2 years ago
indexer	Use a struct as test options (#19393)	2 years ago
json	Refactor legacy `unknwon/com` package, improve golangci lint (#19284)	2 years ago
lfs	Update HTTP status codes to modern codes (#18063)	2 years ago
log	Add Goroutine stack inspector to admin/monitor (#19207)	2 years ago
markup	Remove legacy unmaintained packages, refactor to support change default locale (#19308)	2 years ago
metrics	format with gofumpt (#18184)	2 years ago
migration	Store the foreign ID of issues during migration (#18446)	2 years ago
nosql	Remove legacy `unknwon/com` package (#19298)	2 years ago
notification	Use a struct as test options (#19393)	2 years ago
options	format with gofumpt (#18184)	2 years ago
packages	Add Helm Chart registry (#19406)	2 years ago
paginator	Remove legacy unmaintained packages, refactor to support change default locale (#19308)	2 years ago
password	Fixed assert statements. (#16089)	3 years ago
pprof	refactor: move from io/ioutil to io and os package (#17109)	3 years ago
private	Add Goroutine stack inspector to admin/monitor (#19207)	2 years ago
process	Add Goroutine stack inspector to admin/monitor (#19207)	2 years ago
proxy	Return nil proxy function if proxy not enabled (#16742)	3 years ago
public	Fix mime-type detection for HTTP server (#18370)	2 years ago
queue	Prevent intermittent NPE in queue tests (#19301)	2 years ago
recaptcha	refactor: move from io/ioutil to io and os package (#17109)	3 years ago
references	format with gofumpt (#18184)	2 years ago
repository	Use a struct as test options (#19393)	2 years ago
secret	Use `CryptoRandomBytes` instead of `CryptoRandomString` (#18439)	2 years ago
session	format with gofumpt (#18184)	2 years ago
setting	Fixed registry host value. (#19363)	2 years ago
ssh	Add Goroutine stack inspector to admin/monitor (#19207)	2 years ago
storage	Add Package Registry (#16510)	2 years ago
structs	When updating mirror repo intervals by API reschedule next update too (#19429)	2 years ago
svg	refactor: move from io/ioutil to io and os package (#17109)	3 years ago
sync	Remove legacy `unknwon/com` package (#19298)	2 years ago
templates	Refactor legacy `unknwon/com` package, improve golangci lint (#19284)	2 years ago
test	Make git.OpenRepository accept Context (#19260)	2 years ago
timeutil	Remove legacy unmaintained packages, refactor to support change default locale (#19308)	2 years ago
translation	Remove legacy unmaintained packages, refactor to support change default locale (#19308)	2 years ago
typesniffer	format with gofumpt (#18184)	2 years ago
updatechecker	format with gofumpt (#18184)	2 years ago
upload	Simplify parameter types (#18006)	3 years ago
uri	Prevent NPE if gitea uploader fails to open url (#18080)	3 years ago
user	Add gitea-vet (#10948)	4 years ago
util	Remove legacy `unknwon/com` package (#19298)	2 years ago
validation	format with gofumpt (#18184)	2 years ago
web	Refactor CSRF protection modules, make sure CSRF tokens can be up-to-date. (#19337)	2 years ago