diff options
| author | Unknwon <u@gogs.io> | 2015-03-12 16:01:41 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-03-12 16:01:41 -0400 |
| commit | 48bb63937149e8de3954a8abfc12f3f55d5103dd (patch) | |
| tree | 1e369f5fe5302df37a76b73531fdaa8eb94e4427 | |
| parent | 0720d3988f3e088e527dd857756d6598694494a7 (diff) | |
| parent | 7ba9d1171c1c0cfae14d28da3898cc0db31f830a (diff) | |
| download | gitea-48bb63937149e8de3954a8abfc12f3f55d5103dd.tar.gz gitea-48bb63937149e8de3954a8abfc12f3f55d5103dd.zip | |
Merge branch 'develop' of github.com:gogits/gogs into develop
| -rw-r--r-- | conf/app.ini | 2 | ||||
| -rw-r--r-- | modules/setting/setting.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/app.ini b/conf/app.ini index ad38c42e71..8c33aff917 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -82,7 +82,7 @@ ENABLE_CACHE_AVATAR = false ENABLE_NOTIFY_MAIL = false ; More detail: https://github.com/gogits/gogs/issues/165 ENABLE_REVERSE_PROXY_AUTHENTICATION = false -ENABLE_REVERSE_PROXY_AUTO_REGISTERATION = false +ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false [webhook] ; Cron task interval in minutes diff --git a/modules/setting/setting.go b/modules/setting/setting.go index fd07c17f23..9c1b0ad3c0 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -341,7 +341,7 @@ func newService() { Service.RequireSignInView = Cfg.Section("service").Key("REQUIRE_SIGNIN_VIEW").MustBool() Service.EnableCacheAvatar = Cfg.Section("service").Key("ENABLE_CACHE_AVATAR").MustBool() Service.EnableReverseProxyAuth = Cfg.Section("service").Key("ENABLE_REVERSE_PROXY_AUTHENTICATION").MustBool() - Service.EnableReverseProxyAutoRegister = Cfg.Section("service").Key("ENABLE_REVERSE_PROXY_AUTO_REGISTERATION").MustBool() + Service.EnableReverseProxyAutoRegister = Cfg.Section("service").Key("ENABLE_REVERSE_PROXY_AUTO_REGISTRATION").MustBool() } var logLevels = map[string]string{ |