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		2022-04-21 22:55:45 +01:00
..
activitypub	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
analyze	Use git attributes to determine generated and vendored status for language stats and diffs (#16773)	2021-09-09 21:13:36 +01:00
appstate	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
auth	RSS/Atom support for Repos (#19055)	2022-03-13 17:40:47 +01:00
avatar	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
base	Update JS dependencies (#19281)	2022-04-01 02:15:46 +02:00
cache	Remove legacy unknwon/com package (#19298)	2022-04-02 00:34:57 +08:00
charset	Don't treat BOM escape sequence as hidden character. (#18909)	2022-02-26 16:48:23 +00:00
container	Move reaction to models/issues/ (#19264)	2022-03-31 17:20:39 +08:00
context	RepoAssignment ensure to close before overwrite (#19449)	2022-04-21 17:17:57 +02:00
convert	Set correct PR status on 3way on conflict checking (#19457)	2022-04-21 22:55:45 +01:00
csv	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
doctor	Remove git.Command.Run and git.Command.RunInDir* (#19280)	2022-04-01 10:55:30 +08:00
emoji	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
eventsource	Add Goroutine stack inspector to admin/monitor (#19207)	2022-03-31 19:01:43 +02:00
generate	Use base32 for 2FA scratch token (#18384)	2022-01-26 12:10:10 +08:00
git	Add uploadpack.allowAnySHA1InWant to allow --filter=blob:none with older git clients (#19430)	2022-04-20 17:52:16 +02:00
gitgraph	Remove git.Command.Run and git.Command.RunInDir* (#19280)	2022-04-01 10:55:30 +08:00
graceful	Add Goroutine stack inspector to admin/monitor (#19207)	2022-03-31 19:01:43 +02:00
hcaptcha
highlight	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
hostmatcher	remove not needed (#19128)	2022-03-18 20:17:57 +01:00
httpcache	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
httplib	refactor httplib (#18338)	2022-01-19 19:31:39 -05:00
indexer	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
json	Refactor legacy unknwon/com package, improve golangci lint (#19284)	2022-04-01 16:47:50 +08:00
lfs	Update HTTP status codes to modern codes (#18063)	2022-03-23 12:54:07 +08:00
log	Add Goroutine stack inspector to admin/monitor (#19207)	2022-03-31 19:01:43 +02:00
markup	Remove legacy unmaintained packages, refactor to support change default locale (#19308)	2022-04-03 17:46:48 +08:00
metrics	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
migration	Store the foreign ID of issues during migration (#18446)	2022-03-17 18:08:35 +01:00
nosql	Remove legacy unknwon/com package (#19298)	2022-04-02 00:34:57 +08:00
notification	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
options	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
packages	Add Helm Chart registry (#19406)	2022-04-19 12:55:35 -04:00
paginator	Remove legacy unmaintained packages, refactor to support change default locale (#19308)	2022-04-03 17:46:48 +08:00
password	Fixed assert statements. (#16089)	2021-06-07 07:27:09 +02:00
pprof	refactor: move from io/ioutil to io and os package (#17109)	2021-09-22 13:38:34 +08:00
private	Add Goroutine stack inspector to admin/monitor (#19207)	2022-03-31 19:01:43 +02:00
process	Add Goroutine stack inspector to admin/monitor (#19207)	2022-03-31 19:01:43 +02:00
proxy	Return nil proxy function if proxy not enabled (#16742)	2021-08-19 16:41:20 -04:00
public	Fix mime-type detection for HTTP server (#18370)	2022-01-23 20:19:49 +08:00
queue	Prevent intermittent NPE in queue tests (#19301)	2022-04-02 15:59:04 +08:00
recaptcha	refactor: move from io/ioutil to io and os package (#17109)	2021-09-22 13:38:34 +08:00
references	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
repository	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
secret	Use CryptoRandomBytes instead of CryptoRandomString (#18439)	2022-02-04 18:03:15 +01:00
session	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
setting	Fixed registry host value. (#19363)	2022-04-10 19:57:36 +08:00
ssh	Add Goroutine stack inspector to admin/monitor (#19207)	2022-03-31 19:01:43 +02:00
storage	Add Package Registry (#16510)	2022-03-30 16:42:47 +08:00
structs	When updating mirror repo intervals by API reschedule next update too (#19429)	2022-04-20 09:20:53 +01:00
svg	refactor: move from io/ioutil to io and os package (#17109)	2021-09-22 13:38:34 +08:00
sync	Remove legacy unknwon/com package (#19298)	2022-04-02 00:34:57 +08:00
templates	Refactor legacy unknwon/com package, improve golangci lint (#19284)	2022-04-01 16:47:50 +08:00
test	Make git.OpenRepository accept Context (#19260)	2022-03-30 03:13:41 +08:00
timeutil	Remove legacy unmaintained packages, refactor to support change default locale (#19308)	2022-04-03 17:46:48 +08:00
translation	Remove legacy unmaintained packages, refactor to support change default locale (#19308)	2022-04-03 17:46:48 +08:00
typesniffer	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
updatechecker	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
upload	Simplify parameter types (#18006)	2021-12-20 04:41:31 +00:00
uri	Prevent NPE if gitea uploader fails to open url (#18080)	2021-12-23 16:27:33 +00:00
user
util	Remove legacy unknwon/com package (#19298)	2022-04-02 00:34:57 +08:00
validation	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
web	Refactor CSRF protection modules, make sure CSRF tokens can be up-to-date. (#19337)	2022-04-08 13:21:05 +08:00