Commit Graph

2 Commits (ebac324ff2153602cea1a86c089182ab496f7cd7)

Author SHA1 Message Date
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
1 month ago
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>
1 month ago