mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-26 15:31:53 +00:00
ab6b2309ab
* fix(gitea): prefer fast-forward-only merge style for fast-forward automerge Renovate's fast-forward automerge strategy only merges branches that are already up to date with their target, so mapping it unconditionally to Gitea/Forgejo's "rebase" (rebase-then-fast-forward) merge style fails with a 405 on repos that only allow "Fast-forward only". Prefer fast-forward-only when the repo allows it, falling back to rebase otherwise. Fixes https://github.com/renovatebot/renovate/discussions/42057 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * Update lib/modules/platform/gitea/utils.ts Co-authored-by: Michael Kriese <michael.kriese@gmx.de> * test(gitea): fix getMergeMethod calls for required allowedMergeMethods param Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com> Co-authored-by: Michael Kriese <michael.kriese@gmx.de>