diff --git a/services/pull/merge.go b/services/pull/merge.go index 1bcd11406c..1d5e82e969 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -7,7 +7,6 @@ package pull import ( "context" "fmt" - "net/url" "os" "path/filepath" "regexp" @@ -80,11 +79,7 @@ func getMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issue issueReference = "!" } - issueURL, err := url.JoinPath(setting.AppURL, pr.Issue.Link()) - if err != nil { - return "", "", err - } - reviewedOn := fmt.Sprintf("Reviewed-on: %s", issueURL) + reviewedOn := fmt.Sprintf("Reviewed-on: %s", pr.Issue.HTMLURL()) reviewedBy := pr.GetApprovers(ctx) body = fmt.Sprintf("%s\n%s", reviewedOn, reviewedBy) diff --git a/services/pull/pull_test.go b/services/pull/pull_test.go index bf5c56eda1..1b8b95c1dc 100644 --- a/services/pull/pull_test.go +++ b/services/pull/pull_test.go @@ -14,6 +14,7 @@ import ( "forgejo.org/models/unittest" "forgejo.org/modules/git" "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -57,6 +58,12 @@ func TestPullRequest_GetDefaultMergeMessage_InternalTracker(t *testing.T) { mergeMessage, _, err = GetDefaultMergeMessage(db.DefaultContext, gitRepo, pr, "") require.NoError(t, err) assert.Equal(t, "Merge pull request 'issue3' (#3) from user2/repo1:branch2 into master", mergeMessage) + + setting.AppURL = "https://example.org/suburl/" + setting.AppSubURL = "/suburl" + _, body, err = GetDefaultMergeMessage(db.DefaultContext, gitRepo, pr, "") + require.NoError(t, err) + assert.Equal(t, "Reviewed-on: https://example.org/suburl/user2/repo1/pulls/3\n", body) } func TestPullRequest_GetDefaultMergeMessage_ExternalTracker(t *testing.T) {