oss/forgejo
oss/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-09-15 18:56:59 +00:00
Code Wiki Activity

[PORT] Fix agit automerge (gitea#31881)

Browse source 
Backport https://github.com/go-gitea/gitea/pull/31207 by @lunny

Fix https://github.com/go-gitea/gitea/issues/31134

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

---
Conflict resolution: none
Modification: `s/assert.NoError/require.NoError`

(cherry picked from commit a0d1630700073785baff4ebc3031b0480d44cc63)
This commit is contained in:
Giteabot 2024-08-21 00:20:58 +08:00 • committed by Gusted
parent e3afdb8bc7
commit 75fd8f6445
No known key found for this signature in database
GPG key ID: FD821B732837125F
5 changed files with 154 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/fixtures/repository.yml
View file

@ -26,7 +26,7 @@
fork_id: 0
is_template: false
template_id: 0
size: 7320
size: 7597
is_fsck_enabled: true
close_issues_via_commit_in_any_branch: false