thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions
forgejo/modules
History
Gusted 09adc26eb6
Set correct PR status on 3way on conflict checking (#19457) (#19458) 
- Backport #19457
  - 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.
  - Ref: Fix the latest error for https://gitea.com/gitea/go-sdk/pulls/579

Co-authored-by: zeripath <art27@cantab.net>
2022-04-22 09:11:42 +08:00
..
activitypub Create pub/priv keypair for federation (#17071) 2021-09-28 15:19:22 -04:00
analyze
appstate Decouple unit test code from business code (#17623) 2021-11-12 22:36:47 +08:00
auth fix pam authorization (#19040) (#19047) 2022-03-10 08:15:35 +00:00
avatar Fix various typos (#18219) 2022-01-10 17:32:37 +08:00
base Simplify parameter types (#18006) 2021-12-20 04:41:31 +00:00
cache Test cache during init (#17852) 2021-12-06 00:24:57 +08:00
charset Don't treat BOM escape sequence as hidden character. (#18909) (#18910) 2022-02-26 23:15:04 +01:00
context RepoAssignment ensure to close before overwrite (#19449) (#19460) 2022-04-21 18:55:44 +02:00
convert Set correct PR status on 3way on conflict checking (#19457) (#19458) 2022-04-22 09:11:42 +08:00
csv Fix various typos (#18219) 2022-01-10 17:32:37 +08:00
doctor Fix various typos (#18219) 2022-01-10 17:32:37 +08:00
emoji
eventsource Simplify parameter types (#18006) 2021-12-20 04:41:31 +00:00
generate Support webauthn (#17957) 2022-01-14 16:03:31 +01:00
git Add uploadpack.allowAnySHA1InWant to allow --filter=blob:none with older git clients (#19430) (#19438) 2022-04-20 20:54:36 +02:00
gitgraph Collaborator trust model should trust collaborators (#18539) (#18557) 2022-02-03 11:20:37 -05:00
graceful Immediately Hammer if second kill is sent (#18823) (#18826) 2022-02-20 01:37:52 +08:00
hcaptcha
highlight Bump to build with go1.18 (#19120 et al) (#19127) 2022-03-19 18:46:47 +01:00
hostmatcher Revert the minimal golang version requirement from 1.17 to 1.16 and add a warning in Makefile (#19319) 2022-04-05 13:32:24 -04:00
httpcache Use a variable but a function for IsProd because of a slight performance increment (#17368) 2021-10-20 16:37:19 +02:00
httplib refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
indexer Prevent intermittent failures in RepoIndexerTest (#19225 #19229) (#19228) 2022-03-28 01:01:53 +02:00
json Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
lfs Improve SyncMirrors logging (#19045) (#19050) 2022-03-10 16:06:35 +01:00
log Simplify parameter types (#18006) 2021-12-20 04:41:31 +00:00
markup Bump goldmark to v1.4.11 (#19201) (#19203) 2022-03-24 11:47:40 -04:00
metrics Refactor auth package (#17962) 2022-01-02 21:12:35 +08:00
migration Fix various typos (#18219) 2022-01-10 17:32:37 +08:00
nosql Adjust error for already locked db and prevent level db lock on malformed connstr (#18923) (#18938) 2022-02-28 15:45:38 +00:00
notification Fix problem when self-assign notification (#18797) (#18976) 2022-03-02 20:11:55 +00:00
options Remove golang vendored directory (#18277) 2022-01-14 18:16:05 -05:00
password
pprof refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
private Fix the bug: deploy key with write access can not push (#19010) (#19182) 2022-03-23 13:44:41 +00:00
process Fix various typos (#18219) 2022-01-10 17:32:37 +08:00
proxy
public Fix mime-type detection for HTTP server (#18371) 2022-01-23 21:17:20 +08:00
queue In disk_channel queues synchronously push to disk on shutdown (#18415) (#18788) 2022-02-22 20:08:35 +08:00
recaptcha refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
references Add API to get issue/pull comments and events (timeline) (#17403) 2022-01-01 22:12:25 +08:00
repository Use full output of git show-ref --tags to get tags for PushUpdateAddTag (#19235) (#19236) 2022-03-29 23:19:57 +03:00
secret Simplify parameter types (#18006) 2021-12-20 04:41:31 +00:00
session Refactor auth package (#17962) 2022-01-02 21:12:35 +08:00
setting Only request write when necessary (#18657) (#19422) 2022-04-19 12:10:24 -04:00
ssh Update golang.org/x/crypto (#19097) (#19098) 2022-03-19 12:16:15 +00:00
storage Clean paths when looking in Storage (#19124) (#19179) 2022-03-23 09:23:00 +00:00
structs When updating mirror repo intervals by API reschedule next update too (#19429) (#19433) 2022-04-20 16:04:26 +02:00
svg refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
sync
templates Prevent start panic due to missing DotEscape function 2022-03-23 16:09:57 +00:00
test Unify and simplify TrN for i18n (#18141) 2022-01-02 04:33:57 +01:00
timeutil Don't store assets modified time into generated files (#18193) 2022-01-06 21:33:17 -05:00
translation Sort locales according to their names (#18211) 2022-01-08 12:18:39 +00:00
typesniffer Read expected buffer size (#17409) 2021-10-24 22:12:43 +01:00
updatechecker Fix various typos (#18219) 2022-01-10 17:32:37 +08: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 Add gitea-vet (#10948) 2020-04-05 07:20:50 +01:00
util Revert the minimal golang version requirement from 1.17 to 1.16 and add a warning in Makefile (#19319) 2022-04-05 13:32:24 -04:00
validation Upgrade chi to v5 (#17298) 2021-10-13 22:50:23 -04:00
web Simplify parameter types (#18006) 2021-12-20 04:41:31 +00:00