aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gogs.go2
-rw-r--r--pkg/setting/setting.go7
-rw-r--r--templates/.VERSION2
3 files changed, 7 insertions, 4 deletions
diff --git a/gogs.go b/gogs.go
index 13178fd5..e5f77322 100644
--- a/gogs.go
+++ b/gogs.go
@@ -16,7 +16,7 @@ import (
"github.com/gogs/gogs/pkg/setting"
)
-const APP_VER = "0.11.57.0616"
+const APP_VER = "0.11.57.0617"
func init() {
setting.AppVer = APP_VER
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 2c5297ac..b06c1bf3 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -70,7 +70,8 @@ var (
LocalURL string
OfflineMode bool
DisableRouterLog bool
- CertFile, KeyFile string
+ CertFile string
+ KeyFile string
TLSMinVersion string
StaticRootPath string
EnableGzip bool
@@ -403,7 +404,9 @@ func NewContext() {
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 {
log.Fatal(2, "Fail to parse 'conf/app.ini': %v", err)
}
diff --git a/templates/.VERSION b/templates/.VERSION
index 39ff1f4d..95a1ce39 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.11.57.0616 \ No newline at end of file
+0.11.57.0617 \ No newline at end of file