From 5f312250eb1b42cec5892ff62d863d69f0e5322a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 6 Sep 2024 15:20:30 +0800 Subject: [PATCH] Use forum.gitea.com instead of old URL (#31989) (cherry picked from commit a5818470fe62677d8859b590b2d80b98fe23d098) Signed-off-by: Gergely Nagy Conflicts: - .github/ISSUE_TEMPLATE/bug-report.yaml .github/ISSUE_TEMPLATE/config.yml .github/ISSUE_TEMPLATE/feature-request.yaml .github/ISSUE_TEMPLATE/ui.bug-report.yaml templates/install.tmpl All of these are Gitea-specific. Resolved the conflict by not picking their change. --- modules/activitypub/user_settings_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/activitypub/user_settings_test.go b/modules/activitypub/user_settings_test.go index 7ead81c129..f510e7a6ac 100644 --- a/modules/activitypub/user_settings_test.go +++ b/modules/activitypub/user_settings_test.go @@ -10,7 +10,7 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" - _ "code.gitea.io/gitea/models" // https://discourse.gitea.io/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 + _ "code.gitea.io/gitea/models" // https://forum.gitea.com/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"