diff options
| author | Unknwon <u@gogs.io> | 2015-11-13 17:10:25 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-11-13 17:10:25 -0500 |
| commit | 1d57f0d64fcd9aec16b4003d5664f31ea748da03 (patch) | |
| tree | a369a2581ffc57633c1813dee8ff29d2655fdeb0 /cmd | |
| parent | 1559bd58e7dee6927d31e1aaf1b6ebfc0ffd59dc (diff) | |
| download | gitea-1d57f0d64fcd9aec16b4003d5664f31ea748da03.tar.gz gitea-1d57f0d64fcd9aec16b4003d5664f31ea748da03.zip | |
Show custom avatars in commits
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/web.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/web.go b/cmd/web.go index 9ed9d56782..e51b1bb978 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -7,7 +7,7 @@ package cmd import ( "crypto/tls" "fmt" - "html/template" + gotmpl "html/template" "io/ioutil" "net/http" "net/http/fcgi" @@ -35,11 +35,11 @@ import ( "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/auth/apiv1" "github.com/gogits/gogs/modules/avatar" - "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/setting" + "github.com/gogits/gogs/modules/template" "github.com/gogits/gogs/routers" "github.com/gogits/gogs/routers/admin" "github.com/gogits/gogs/routers/api/v1" @@ -124,7 +124,7 @@ func newMacaron() *macaron.Macaron { )) m.Use(macaron.Renderer(macaron.RenderOptions{ Directory: path.Join(setting.StaticRootPath, "templates"), - Funcs: []template.FuncMap{base.TemplateFuncs}, + Funcs: []gotmpl.FuncMap{template.Funcs}, IndentJSON: macaron.Env != macaron.PROD, })) |