mirror of https://github.com/go-gitea/gitea
8f45a11919
Backport #33319 Fix #33271 The only conflict is `reqctx` in `services/repository/merge_upstream.go`, which could keep using `context.Context` in 1.23 |
||
---|---|---|
.. | ||
recently_pushed_new_branches.tmpl | ||
upstream_diverging_info.tmpl |