Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use relative links for commits, mentions, and issues in markdown #29427

Merged
merged 11 commits into from Mar 13, 2024
Merged

Use relative links for commits, mentions, and issues in markdown #29427

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
db9e758
Use relative links.
KN4CK3R Feb 26, 2024
ed4b32e
Use absolute links in mails.
KN4CK3R Feb 26, 2024
55ae966
Merge branch 'main' of https://github.com/go-gitea/gitea into enhance…
KN4CK3R Feb 29, 2024
f40d2d2
Merge branch 'main' into enhancement-relative-link
silverwind Mar 1, 2024
0c5dccc
Merge branch 'main' into enhancement-relative-link
silverwind Mar 5, 2024
76abf30
Merge branch 'main' into enhancement-relative-link
silverwind Mar 7, 2024
c3d32c1
Merge branch 'enhancement-relative-link' of https://github.com/KN4CK3…
KN4CK3R Mar 8, 2024
7be3d2b
Fix tests.
KN4CK3R Mar 8, 2024
518a434
Use quotedprintable reader.
KN4CK3R Mar 8, 2024
25befd2
Merge branch 'main' into enhancement-relative-link
GiteaBot Mar 13, 2024
bf4da2b
Merge branch 'main' into enhancement-relative-link
GiteaBot Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions modules/markup/html.go
View file
Open in desktop
Expand Up @@ -609,7 +609,7 @@ func mentionProcessor(ctx *RenderContext, node *html.Node) {
if ok && strings.Contains(mention, "/") {
mentionOrgAndTeam := strings.Split(mention, "/")
if mentionOrgAndTeam[0][1:] == ctx.Metas["org"] && strings.Contains(teams, ","+strings.ToLower(mentionOrgAndTeam[1])+",") {
replaceContent(node, loc.Start, loc.End, createLink(util.URLJoin(setting.AppURL, "org", ctx.Metas["org"], "teams", mentionOrgAndTeam[1]), mention, "mention"))
replaceContent(node, loc.Start, loc.End, createLink(util.URLJoin(setting.AppSubURL, "org", ctx.Metas["org"], "teams", mentionOrgAndTeam[1]), mention, "mention"))
node = node.NextSibling.NextSibling
start = 0
continue
Expand All @@ -620,7 +620,7 @@ func mentionProcessor(ctx *RenderContext, node *html.Node) {
mentionedUsername := mention[1:]

if DefaultProcessorHelper.IsUsernameMentionable != nil && DefaultProcessorHelper.IsUsernameMentionable(ctx.Ctx, mentionedUsername) {
replaceContent(node, loc.Start, loc.End, createLink(util.URLJoin(setting.AppURL, mentionedUsername), mention, "mention"))
replaceContent(node, loc.Start, loc.End, createLink(util.URLJoin(setting.AppSubURL, mentionedUsername), mention, "mention"))
node = node.NextSibling.NextSibling
} else {
node = node.NextSibling
Expand Down Expand Up @@ -898,9 +898,9 @@ func issueIndexPatternProcessor(ctx *RenderContext, node *html.Node) {
path = "pulls"
}
if ref.Owner == "" {
link = createLink(util.URLJoin(setting.AppURL, ctx.Metas["user"], ctx.Metas["repo"], path, ref.Issue), reftext, "ref-issue")
link = createLink(util.URLJoin(setting.AppSubURL, ctx.Metas["user"], ctx.Metas["repo"], path, ref.Issue), reftext, "ref-issue")
} else {
link = createLink(util.URLJoin(setting.AppURL, ref.Owner, ref.Name, path, ref.Issue), reftext, "ref-issue")
link = createLink(util.URLJoin(setting.AppSubURL, ref.Owner, ref.Name, path, ref.Issue), reftext, "ref-issue")
}
}

Expand Down Expand Up @@ -1166,7 +1166,7 @@ func hashCurrentPatternProcessor(ctx *RenderContext, node *html.Node) {
continue
}

link := util.URLJoin(setting.AppURL, ctx.Metas["user"], ctx.Metas["repo"], "commit", hash)
link := util.URLJoin(setting.AppSubURL, ctx.Metas["user"], ctx.Metas["repo"], "commit", hash)
replaceContent(node, m[2], m[3], createCodeLink(link, base.ShortSha(hash), "commit"))
start = 0
node = node.NextSibling.NextSibling
Expand Down