backport #21227 author @svenseeberg Co-authored-by: Sven Seeberg <mail@sven-seeberg.de> Co-authored-by: Giteabot <teabot@gitea.io>
backport #26739
See https://github.com/go-gitea/gitea/pull/26051 --------- Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: JonRB <4564448+eeyrjmr@users.noreply.github.com>