#1286 #2098 Alpha support for custom templates

No guarantee for compatibility with future changes
This commit is contained in:
Unknwon 2016-03-12 13:48:34 -05:00
parent 985a0f3450
commit d733efc1cc
4 changed files with 8 additions and 7 deletions

View File

@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current version: 0.9.6 ##### Current version: 0.9.7
| Web | UI | Preview | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|

View File

@ -86,7 +86,7 @@ func checkVersion() {
{"github.com/go-macaron/session", session.Version, "0.1.6"}, {"github.com/go-macaron/session", session.Version, "0.1.6"},
{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"}, {"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
{"gopkg.in/ini.v1", ini.Version, "1.8.4"}, {"gopkg.in/ini.v1", ini.Version, "1.8.4"},
{"gopkg.in/macaron.v1", macaron.Version, "0.8.0"}, {"gopkg.in/macaron.v1", macaron.Version, "1.1.1"},
{"github.com/gogits/git-module", git.Version, "0.2.9"}, {"github.com/gogits/git-module", git.Version, "0.2.9"},
{"github.com/gogits/go-gogs-client", gogs.Version, "0.7.3"}, {"github.com/gogits/go-gogs-client", gogs.Version, "0.7.3"},
} }
@ -124,9 +124,10 @@ func newMacaron() *macaron.Macaron {
}, },
)) ))
m.Use(macaron.Renderer(macaron.RenderOptions{ m.Use(macaron.Renderer(macaron.RenderOptions{
Directory: path.Join(setting.StaticRootPath, "templates"), Directory: path.Join(setting.StaticRootPath, "templates"),
Funcs: template.NewFuncMap(), AppendDirectories: []string{path.Join(setting.CustomPath, "templates")},
IndentJSON: macaron.Env != macaron.PROD, Funcs: template.NewFuncMap(),
IndentJSON: macaron.Env != macaron.PROD,
})) }))
localeNames, err := bindata.AssetDir("conf/locale") localeNames, err := bindata.AssetDir("conf/locale")

View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.9.6.0311" const APP_VER = "0.9.7.0312"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

View File

@ -1 +1 @@
0.9.6.0311 0.9.7.0312