diff options
| author | lunnyxiao <xiaolunwen@gmail.com> | 2014-09-17 12:04:18 +0800 |
|---|---|---|
| committer | lunnyxiao <xiaolunwen@gmail.com> | 2014-09-17 12:04:18 +0800 |
| commit | 061a879cea39a1cce56dcb394b912fad50d7b77a (patch) | |
| tree | 26e8c3d25da1b9d785421a6a02b7564798b2e8c4 /modules/setting | |
| parent | ed84adb679f3de70b2bffaead20a87711c38ee3a (diff) | |
| parent | 9f015b4c73806e65d3ca085b76723dc8cf41eb02 (diff) | |
| download | gitea-061a879cea39a1cce56dcb394b912fad50d7b77a.tar.gz gitea-061a879cea39a1cce56dcb394b912fad50d7b77a.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
conf/app.ini
Diffstat (limited to 'modules/setting')
| -rw-r--r-- | modules/setting/setting.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 011c00c08c..c56ad2421a 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -10,6 +10,7 @@ import ( "os/exec" "path" "path/filepath" + "runtime" "strings" "time" @@ -99,12 +100,14 @@ var ( CustomPath string // Custom directory path. ProdMode bool RunUser string + IsWindows bool // I18n settings. Langs, Names []string ) func init() { + IsWindows = runtime.GOOS == "windows" log.NewLogger(0, "console", `{"level": 0}`) } |