summaryrefslogtreecommitdiffstats
path: root/modules/base
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-04-22 05:30:53 -0400
committerUnknown <joe2010xtmf@163.com>2014-04-22 05:30:53 -0400
commit5435b259ccdfc7795183d54fec9ba673f2938297 (patch)
tree0d8280f1073c8b10e80b5eed18f49a1813bc7c88 /modules/base
parent2a9da4b8e54736c3a8f7ecc41f3c75fdcfb70f9b (diff)
parentdbdaf934e1b8fab06361266268bb55d30b352f37 (diff)
downloadgitea-5435b259ccdfc7795183d54fec9ba673f2938297.tar.gz
gitea-5435b259ccdfc7795183d54fec9ba673f2938297.zip
Merge branch 'master' of github.com:gogits/gogs into dev
Diffstat (limited to 'modules/base')
-rw-r--r--modules/base/conf.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/base/conf.go b/modules/base/conf.go
index 48ba46583a..abb67f6d8f 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -84,7 +84,7 @@ var (
var Service struct {
RegisterEmailConfirm bool
- DisenableRegisteration bool
+ DisableRegistration bool
RequireSignInView bool
EnableCacheAvatar bool
NotifyMail bool
@@ -116,7 +116,7 @@ var logLevels = map[string]string{
func newService() {
Service.ActiveCodeLives = Cfg.MustInt("service", "ACTIVE_CODE_LIVE_MINUTES", 180)
Service.ResetPwdCodeLives = Cfg.MustInt("service", "RESET_PASSWD_CODE_LIVE_MINUTES", 180)
- Service.DisenableRegisteration = Cfg.MustBool("service", "DISENABLE_REGISTERATION", false)
+ Service.DisableRegistration = Cfg.MustBool("service", "DISABLE_REGISTRATION", false)
Service.RequireSignInView = Cfg.MustBool("service", "REQUIRE_SIGNIN_VIEW", false)
Service.EnableCacheAvatar = Cfg.MustBool("service", "ENABLE_CACHE_AVATAR", false)
}