wxiaoguang
8f45a11919
Improve sync fork behavior ( #33319 ) ( #33332 )
...
Backport #33319
Fix #33271
The only conflict is `reqctx` in
`services/repository/merge_upstream.go`, which could keep using
`context.Context` in 1.23
2025-01-20 07:50:38 +00:00
wxiaoguang
8d9ea68f19
Fix push message behavior ( #33215 ) ( #33317 )
...
Backport #33215
Manually resolved "reqctx" conflict
---------
Co-authored-by: Chai-Shi <changchaishi@gmail.com>
2025-01-19 10:48:28 +08:00
Giteabot
d70348836b
Fix sync fork for consistency ( #33147 ) ( #33192 )
...
Backport #33147 by changchaishi
Fixes #33145
An integration test could be added.
---------
Co-authored-by: Chai-Shi <changchaishi@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2025-01-10 15:11:45 +08:00
wxiaoguang
513da407f4
Support "merge upstream branch" (Sync fork) ( #32741 )
...
Add basic "sync fork" support (GitHub-like)
<details>
![image](https://github.com/user-attachments/assets/e71473f4-4518-48c7-b9e2-fedfcd564fc3 )
</details>
2024-12-06 21:10:35 +00:00