davrot/forgejo_backup
1
0
Fork 0
mirror of https://codeberg.org/davrot/forgejo.git synced 2025-06-14 08:00:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: use url.JoinPath to join url parts

Browse source 
This avoids duplicated or more slashes.

fixes #4759

(cherry picked from commit 46357e7856)
This commit is contained in:
Michael Kriese 2024-07-31 13:55:14 +02:00 • committed by GitHub
parent 8493433cfb
commit 2f29452b9f
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
services/pull/pull_test.go
View file

@ -47,9 +47,10 @@ func TestPullRequest_GetDefaultMergeMessage_InternalTracker(t *testing.T) {
require.NoError(t, err)
defer gitRepo.Close()
mergeMessage, _, err := GetDefaultMergeMessage(db.DefaultContext, gitRepo, pr, "")
mergeMessage, body, err := GetDefaultMergeMessage(db.DefaultContext, gitRepo, pr, "")
require.NoError(t, err)
assert.Equal(t, "Merge pull request 'issue3' (#3) from branch2 into master", mergeMessage)
assert.Equal(t, "Reviewed-on: https://try.gitea.io/user2/repo1/pulls/3\n", body)
pr.BaseRepoID = 1
pr.HeadRepoID = 2