oss/forgejo
oss/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-11 17:50:57 +00:00
Code Wiki Activity

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

7
services/pull/merge.go
View file

@ -7,6 +7,7 @@ package pull
import (
"context"
"fmt"
"net/url"
"os"
"path/filepath"
"regexp"
@ -56,7 +57,11 @@ func getMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issue
issueReference = "!"
}
reviewedOn := fmt.Sprintf("Reviewed-on: %s/%s", setting.AppURL, pr.Issue.Link())
issueURL, err := url.JoinPath(setting.AppURL, pr.Issue.Link())
if err != nil {
return "", "", err
}
reviewedOn := fmt.Sprintf("Reviewed-on: %s", issueURL)
reviewedBy := pr.GetApprovers(ctx)
if mergeStyle != "" {