aboutsummaryrefslogtreecommitdiffstats
path: root/routers/repo/pull.go
diff options
context:
space:
mode:
authorLauris BH <lauris@nix.lv>2017-11-27 02:58:54 +0200
committerGitHub <noreply@github.com>2017-11-27 02:58:54 +0200
commit0d4c63fd70d0b255a9a17352cc47ec2b6ca13440 (patch)
tree1128c5e474474bf7b2967dee8b9528dc207c6aa7 /routers/repo/pull.go
parentfb5c6b644460f94acb8976ad35165230b9d47fb2 (diff)
downloadgitea-0d4c63fd70d0b255a9a17352cc47ec2b6ca13440.tar.gz
gitea-0d4c63fd70d0b255a9a17352cc47ec2b6ca13440.zip
Fix go-get, src and raw urls to new scheme (#2978)
Diffstat (limited to 'routers/repo/pull.go')
-rw-r--r--routers/repo/pull.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 14b0928734..284cb2d2d5 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -480,9 +480,9 @@ func ViewPullFiles(ctx *context.Context) {
}
ctx.Data["IsImageFile"] = commit.IsImageFile
- ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", endCommitID)
- ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", startCommitID)
- ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", endCommitID)
+ ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", "commit", endCommitID)
+ ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", "commit", startCommitID)
+ ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", "commit", endCommitID)
ctx.Data["RequireHighlightJS"] = true
ctx.HTML(200, tplPullFiles)
@@ -689,9 +689,9 @@ func PrepareCompareDiff(
ctx.Data["IsImageFile"] = headCommit.IsImageFile
headTarget := path.Join(headUser.Name, repo.Name)
- ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", headCommitID)
- ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", prInfo.MergeBase)
- ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", headCommitID)
+ ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", "commit", headCommitID)
+ ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", "commit", prInfo.MergeBase)
+ ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", "commit", headCommitID)
return false
}