Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-12-20 07:09:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

pkg/setting: ignore config inline comment by default

Browse Source
This commit is contained in:
Unknwon
2018-06-17 09:10:18 +08:00
parent bcf83ea792
commit ef02414d7e
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gogs.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/gogs/gogs/pkg/setting" "github.com/gogs/gogs/pkg/setting"
) )
const APP_VER = "0.11.57.0616" const APP_VER = "0.11.57.0617"
func init() { func init() {
setting.AppVer = APP_VER setting.AppVer = APP_VER

7
pkg/setting/setting.go
View File

@@ -70,7 +70,8 @@ var (
LocalURL string LocalURL string
OfflineMode bool OfflineMode bool
DisableRouterLog bool DisableRouterLog bool
CertFile, KeyFile string CertFile string
KeyFile string
TLSMinVersion string TLSMinVersion string
StaticRootPath string StaticRootPath string
EnableGzip bool EnableGzip bool
@@ -403,7 +404,9 @@ func NewContext() {
log.Fatal(2, "Fail to get work directory: %v", err) log.Fatal(2, "Fail to get work directory: %v", err)
} }
Cfg, err = ini.Load(bindata.MustAsset("conf/app.ini")) Cfg, err = ini.LoadSources(ini.LoadOptions{
IgnoreInlineComment: true,
}, bindata.MustAsset("conf/app.ini"))
if err != nil { if err != nil {
log.Fatal(2, "Fail to parse 'conf/app.ini': %v", err) log.Fatal(2, "Fail to parse 'conf/app.ini': %v", err)
} }

2
templates/.VERSION
View File

@@ -1 +1 @@
0.11.57.0616 0.11.57.0617