1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-03 00:45:22 +02:00

Merge branch 'master' into feature/goimports

This commit is contained in:
Sandro Santilli 2016-11-05 22:54:20 +01:00 committed by GitHub
commit f36544f98d
5 changed files with 8 additions and 27 deletions

View file

@ -366,11 +366,6 @@ func ViewPullFiles(ctx *context.Context) {
return
}
setEditorconfigIfExists(ctx)
if ctx.Written() {
return
}
headTarget := path.Join(pull.HeadUserName, pull.HeadRepo.Name)
ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split"
ctx.Data["Username"] = pull.HeadUserName
@ -623,11 +618,6 @@ func CompareAndPullRequest(ctx *context.Context) {
}
}
setEditorconfigIfExists(ctx)
if ctx.Written() {
return
}
ctx.HTML(200, COMPARE_PULL)
}