From 3c83167633e739b4398fca88a9ac97dd21607714 Mon Sep 17 00:00:00 2001 From: dragon Date: Fri, 14 Jun 2024 10:44:55 +0800 Subject: [PATCH 1/2] fix bugs --- services/pull/merge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/pull/merge.go b/services/pull/merge.go index 9ef3fb2e0593a..e3eff6008c41b 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -56,7 +56,7 @@ func getMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issue issueReference = "!" } - reviewedOn := fmt.Sprintf("Reviewed-on: %s/%s", setting.AppURL, pr.Issue.Link()) + reviewedOn := fmt.Sprintf("Reviewed-on: %s%s", setting.AppURL, strings.TrimPrefix(pr.Issue.Link(), "/")) reviewedBy := pr.GetApprovers(ctx) if mergeStyle != "" { From 88670f3a1d741b0d0ad9da2b2743644489da3051 Mon Sep 17 00:00:00 2001 From: dragon Date: Fri, 14 Jun 2024 11:23:57 +0800 Subject: [PATCH 2/2] merge wxiaoguang 's review --- services/pull/merge.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/pull/merge.go b/services/pull/merge.go index e3eff6008c41b..e19292c31ca99 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -23,6 +23,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/cache" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/httplib" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/references" repo_module "code.gitea.io/gitea/modules/repository" @@ -56,7 +57,7 @@ func getMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issue issueReference = "!" } - reviewedOn := fmt.Sprintf("Reviewed-on: %s%s", setting.AppURL, strings.TrimPrefix(pr.Issue.Link(), "/")) + reviewedOn := fmt.Sprintf("Reviewed-on: %s", httplib.MakeAbsoluteURL(ctx, pr.Issue.Link())) reviewedBy := pr.GetApprovers(ctx) if mergeStyle != "" {