From 2527037973441054692ee11446196d3ac6b135c3 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 1 Feb 2017 07:24:20 -0500 Subject: routers/repo: minor code fix for PR #3758 --- routers/repo/middlewares.go | 23 ----------------------- routers/repo/view.go | 9 +++++++++ 2 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 routers/repo/middlewares.go (limited to 'routers') diff --git a/routers/repo/middlewares.go b/routers/repo/middlewares.go deleted file mode 100644 index 2c344420..00000000 --- a/routers/repo/middlewares.go +++ /dev/null @@ -1,23 +0,0 @@ -package repo - -import ( - "fmt" - - "github.com/gogits/git-module" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/context" -) - -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 -} diff --git a/routers/repo/view.go b/routers/repo/view.go index 7d9278e7..18c79e08 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -211,6 +211,15 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st } } +func setEditorconfigIfExists(ctx *context.Context) { + ec, err := ctx.Repo.GetEditorconfig() + if err != nil && !git.IsErrNotExist(err) { + log.Error(4, "Fail to get '.editorconfig' [%d]: %v", ctx.Repo.Repository.ID, err) + return + } + ctx.Data["Editorconfig"] = ec +} + func Home(ctx *context.Context) { title := ctx.Repo.Repository.Owner.Name + "/" + ctx.Repo.Repository.Name if len(ctx.Repo.Repository.Description) > 0 { -- cgit v1.2.3