Browse Source

pkg/setting: ignore config inline comment by default

pull/5340/head
Unknwon 7 years ago
parent
commit
ef02414d7e
No known key found for this signature in database
GPG Key ID: 7A02C406FAC875A2
  1. 2
      gogs.go
  2. 7
      pkg/setting/setting.go
  3. 2
      templates/.VERSION

2
gogs.go

@ -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

@ -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

@ -1 +1 @@
0.11.57.0616 0.11.57.0617
Loading…
Cancel
Save