Fix redirect url of legacy commits route (#2825)

1 files changed, 1 insertions, 11 deletions

diff --git a/modules/context/repo.go b/modules/context/repo.go
index b2b58c4f26..8e0c584c82 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -521,16 +521,6 @@ func getRefName(ctx *Context, pathType RepoRefType) string {
 	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
 // of repository reference
 func RepoRefByType(refType RepoRefType) macaron.Handler {
@@ -617,7 +607,7 @@ func RepoRefByType(refType RepoRefType) macaron.Handler {
 
 			if refType == RepoRefLegacy {
 				// 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
 			}
 		}