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

redirect .wiki/* ui link to /wiki #18831

Merged
merged 12 commits into from
Mar 23, 2022
Merged

redirect .wiki/* ui link to /wiki #18831

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4923af3
redirect .wiki/* ui link to /wiki
a1012112796 Feb 20, 2022
bbf6a27
Merge branch 'main' into wiki_link
a1012112796 Mar 2, 2022
4d5b265
handle link
a1012112796 Mar 3, 2022
6f20718
Merge branch 'main' into wiki_link
a1012112796 Mar 3, 2022
3a23361
fix split logic
a1012112796 Mar 4, 2022
d5e55f1
Merge branch 'main' into wiki_link
a1012112796 Mar 4, 2022
d1f7961
Merge branch 'main' into wiki_link
a1012112796 Mar 5, 2022
e210502
Merge branch 'main' into wiki_link
a1012112796 Mar 17, 2022
8af14e7
Merge remote-tracking branch 'origin/main' into wiki_link
zeripath Mar 23, 2022
f3d5d7a
Correctly redirect using the similar code to the username redirect code
zeripath Mar 23, 2022
ac1bade
Placate lint
zeripath Mar 23, 2022
74db523
Merge branch 'main' into wiki_link
zeripath Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions modules/context/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,26 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) {
ctx.Repo.Owner = owner
ctx.Data["Username"] = ctx.Repo.Owner.Name

// redirect link to wiki
if strings.HasSuffix(repoName, ".wiki") {
// ctx.Req.URL.Path does not have the preceding appSubURL - any redirect must have this added
// Now we happen to know that all of our paths are: /:username/:reponame/whatever_else
originalRepoName := ctx.Params(":reponame")
redirectRepoName := strings.TrimSuffix(repoName, ".wiki")
redirectRepoName += originalRepoName[len(redirectRepoName)+5:]
redirectPath := strings.Replace(
ctx.Req.URL.EscapedPath(),
url.PathEscape(userName)+"/"+url.PathEscape(originalRepoName),
url.PathEscape(userName)+"/"+url.PathEscape(redirectRepoName)+"/wiki",
1,
)
if ctx.Req.URL.RawQuery != "" {
redirectPath += "?" + ctx.Req.URL.RawQuery
}
ctx.Redirect(path.Join(setting.AppSubURL, redirectPath))
return
}

// Get repository.
repo, err := repo_model.GetRepositoryByName(owner.ID, repoName)
if err != nil {
Expand Down