aboutsummaryrefslogtreecommitdiff
path: root/routers/repo/pull.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-02-07 11:49:11 -0500
committerUnknwon <u@gogs.io>2016-02-07 11:49:11 -0500
commitf15a2f9b25bbec130915fec5b33c7e49dc7cf57d (patch)
tree1ba3aa079c4f931a6fef87693cf83e731a323bcc /routers/repo/pull.go
parent3b102a71a2cef4a3cdb748bbc6e0499fdec5e3b4 (diff)
parent2bfb8bb5fdebb4ae02c83a271e8eb24bc68afec1 (diff)
Merge pull request #2528 from andreynering/diff-sintax-highlight-733
Enable syntax highlighting on diff view
Diffstat (limited to 'routers/repo/pull.go')
-rw-r--r--routers/repo/pull.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index e3500716..3240461c 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -362,6 +362,7 @@ func ViewPullFiles(ctx *middleware.Context) {
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["RequireHighlightJS"] = true
ctx.HTML(200, PULL_FILES)
}
@@ -538,6 +539,7 @@ func CompareAndPullRequest(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("repo.pulls.compare_changes")
ctx.Data["PageIsComparePull"] = true
ctx.Data["IsDiffCompare"] = true
+ ctx.Data["RequireHighlightJS"] = true
renderAttachmentSettings(ctx)
headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch := ParseCompareInfo(ctx)