nordic-dev.net/gitea
nordic-dev.net/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-27 16:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59 from andreynering/gitea/fix-500-on-invalid-editorconfig

Browse Source 
Fix 500 when repo has invalid .editorconfig
This commit is contained in:
Sandro Santilli 2016-11-05 16:53:36 +01:00 committed by GitHub
commit 789dacdfbe
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
routers/repo/commit.go
View File

@ -179,12 +179,10 @@ func Diff(ctx *context.Context) {
}
}
ec, err := ctx.Repo.GetEditorconfig()
if err != nil && !git.IsErrNotExist(err) {
ctx.Handle(500, "ErrGettingEditorconfig", err)
setEditorconfigIfExists(ctx)
if ctx.Written() {
return
}
ctx.Data["Editorconfig"] = ec
ctx.Data["CommitID"] = commitID
ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split"

23
routers/repo/middlewares.go Normal file
View File

@ -0,0 +1,23 @@
package repo
import (
"fmt"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/gogits/git-module"
)
func setEditorconfigIfExists(ctx *context.Context) {
ec, err := ctx.Repo.GetEditorconfig()
if err != nil && !git.IsErrNotExist(err) {
description := fmt.Sprintf("Error while getting .editorconfig file: %v", err)
if err := models.CreateRepositoryNotice(description); err != nil {
ctx.Handle(500, "ErrCreatingReporitoryNotice", err)
}
return
}
ctx.Data["Editorconfig"] = ec
}

12
routers/repo/pull.go
View File

@ -368,12 +368,10 @@ func ViewPullFiles(ctx *context.Context) {
return
}
ec, err := ctx.Repo.GetEditorconfig()
if err != nil && !git.IsErrNotExist(err) {
ctx.Handle(500, "ErrGettingEditorconfig", err)
setEditorconfigIfExists(ctx)
if ctx.Written() {
return
}
ctx.Data["Editorconfig"] = ec
headTarget := path.Join(pull.HeadUserName, pull.HeadRepo.Name)
ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split"
@ -627,12 +625,10 @@ func CompareAndPullRequest(ctx *context.Context) {
}
}
ec, err := ctx.Repo.GetEditorconfig()
if err != nil && !git.IsErrNotExist(err) {
ctx.Handle(500, "ErrGettingEditorconfig", err)
setEditorconfigIfExists(ctx)
if ctx.Written() {
return
}
ctx.Data["Editorconfig"] = ec
ctx.HTML(200, COMPARE_PULL)
}

6
routers/repo/view.go
View File

@ -245,12 +245,10 @@ func Home(ctx *context.Context) {
return
}
ec, err := ctx.Repo.GetEditorconfig()
if err != nil && !git.IsErrNotExist(err) {
ctx.Handle(500, "Repo.GetEditorconfig", err)
setEditorconfigIfExists(ctx)
if ctx.Written() {
return
}
ctx.Data["Editorconfig"] = ec
var treeNames []string
paths := make([]string, 0, 5)