|
|
@ -521,16 +521,6 @@ func getRefName(ctx *Context, pathType RepoRefType) string { |
|
|
|
return "" |
|
|
|
return "" |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// URL to redirect to for deprecated URL scheme
|
|
|
|
|
|
|
|
func repoRefRedirect(ctx *Context) string { |
|
|
|
|
|
|
|
urlPath := ctx.Req.URL.String() |
|
|
|
|
|
|
|
idx := strings.LastIndex(urlPath, ctx.Params("*")) |
|
|
|
|
|
|
|
if idx < 0 { |
|
|
|
|
|
|
|
idx = len(urlPath) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return path.Join(urlPath[:idx], ctx.Repo.BranchNameSubURL()) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// RepoRefByType handles repository reference name for a specific type
|
|
|
|
// RepoRefByType handles repository reference name for a specific type
|
|
|
|
// of repository reference
|
|
|
|
// of repository reference
|
|
|
|
func RepoRefByType(refType RepoRefType) macaron.Handler { |
|
|
|
func RepoRefByType(refType RepoRefType) macaron.Handler { |
|
|
@ -617,7 +607,7 @@ func RepoRefByType(refType RepoRefType) macaron.Handler { |
|
|
|
|
|
|
|
|
|
|
|
if refType == RepoRefLegacy { |
|
|
|
if refType == RepoRefLegacy { |
|
|
|
// redirect from old URL scheme to new URL scheme
|
|
|
|
// redirect from old URL scheme to new URL scheme
|
|
|
|
ctx.Redirect(repoRefRedirect(ctx)) |
|
|
|
ctx.Redirect(path.Join(setting.AppSubURL, strings.TrimSuffix(ctx.Req.URL.String(), ctx.Params("*")), ctx.Repo.BranchNameSubURL())) |
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|