65529bd334
Fix #30684
(cherry picked from commit f09e68ec33262d5356779572a0b1c66e6e86590f)
Conflicts:
tests/integration/pull_merge_test.go
trivial context conflict
(cherry picked from commit
|
||
---|---|---|
.. | ||
e2e | ||
fuzz | ||
gitea-lfs-meta | ||
gitea-repositories-meta | ||
integration | ||
testdata/data/attachments/a/0 | ||
mssql.ini.tmpl | ||
mysql.ini.tmpl | ||
pgsql.ini.tmpl | ||
sqlite.ini.tmpl | ||
test_utils.go |