2 commits

Author	SHA1	Message	Date
forgejo-backport-action	e286457990	[v11.0/forgejo] chore: branding import path (#7354) ... **Backport:** https://codeberg.org/forgejo/forgejo/pulls/7337 - Massive replacement of changing `code.gitea.io/gitea` to `forgejo.org`. - Resolves forgejo/discussions#258 Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7354 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>	2025-03-27 20:13:05 +00:00
Lunny Xiao	7d7ea45465	Fix automerge will not work because of some events haven't been triggered (#30780) ... Replace #25741 Close #24445 Close #30658 Close #20646 ~Depends on #30805~ Since #25741 has been rewritten totally, to make the contribution easier, I will continue the work in this PR. Thanks @6543 --------- Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> (cherry picked from commit c6cf96d31d80ab79d370a6192fd761b4443daec2) Conflicts: tests/integration/editor_test.go trivial context conflict because of 75ce1e2ac1 [GITEA] Allow user to select email for file operations in Web UI tests/integration/pull_merge_test.go trivial context conflicts in imports because more tests were added in Forgejo	2024-05-26 19:01:36 +02:00