tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Merge branch 'master' into feature/goimports

Browse Source
This commit is contained in:
Sandro Santilli
2016-11-05 22:54:20 +01:00
committed by GitHub
parent 953c099428 a0e54c0512
commit f36544f98d
5 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
routers/repo/pull.go
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)
}