loading up the forgejo repo on tangled to test page performance
Merge pull request 'fix: use `url.JoinPath` to join url parts' (#4761) from viceice/tripple-slash-review-url into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4761
Reviewed-by: Panagiotis "Ivory" Vasilopoulos <git@n0toose.net>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
+8
-2
+6
-1
services/pull/merge.go
+6
-1
services/pull/merge.go
···
7
7
import (
8
8
"context"
9
9
"fmt"
10
+
"net/url"
10
11
"os"
11
12
"path/filepath"
12
13
"regexp"
···
56
57
issueReference = "!"
57
58
}
58
59
59
-
reviewedOn := fmt.Sprintf("Reviewed-on: %s/%s", setting.AppURL, pr.Issue.Link())
60
+
issueURL, err := url.JoinPath(setting.AppURL, pr.Issue.Link())
61
+
if err != nil {
62
+
return "", "", err
63
+
}
64
+
reviewedOn := fmt.Sprintf("Reviewed-on: %s", issueURL)
60
65
reviewedBy := pr.GetApprovers(ctx)
61
66
62
67
if mergeStyle != "" {
+2
-1
services/pull/pull_test.go
+2
-1
services/pull/pull_test.go
···
47
47
require.NoError(t, err)
48
48
defer gitRepo.Close()
49
49
50
-
mergeMessage, _, err := GetDefaultMergeMessage(db.DefaultContext, gitRepo, pr, "")
50
+
mergeMessage, body, err := GetDefaultMergeMessage(db.DefaultContext, gitRepo, pr, "")
51
51
require.NoError(t, err)
52
52
assert.Equal(t, "Merge pull request 'issue3' (#3) from branch2 into master", mergeMessage)
53
+
assert.Equal(t, "Reviewed-on: https://try.gitea.io/user2/repo1/pulls/3\n", body)
53
54
54
55
pr.BaseRepoID = 1
55
56
pr.HeadRepoID = 2