forked from gitea/gitea

Backport clean cherry-picks of https://github.com/go-gitea/gitea/pull/25133 and https://github.com/go-gitea/gitea/pull/25162 to 1.20.
Backport clean cherry-picks of https://github.com/go-gitea/gitea/pull/25133 and https://github.com/go-gitea/gitea/pull/25162 to 1.20.