diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-05-02 00:27:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 00:27:53 +0800 |
| commit | 3ebbdfaa757e1299b3a495c8fc711d574c0d278f (patch) | |
| tree | 7fe919f1a4e8e6ff5a1a695131c14d4329a4b703 | |
| parent | 950f2e207413551b868252a1bced6ce9263d16d4 (diff) | |
| download | gitea-3ebbdfaa757e1299b3a495c8fc711d574c0d278f.tar.gz gitea-3ebbdfaa757e1299b3a495c8fc711d574c0d278f.zip | |
make openid support default false for compitable with v1.1 (#1650)
| -rw-r--r-- | modules/setting/setting.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 8a2db2b4ba..a00db16d3a 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -995,8 +995,8 @@ func newService() { Service.NoReplyAddress = sec.Key("NO_REPLY_ADDRESS").MustString("noreply.example.org") sec = Cfg.Section("openid") - Service.EnableOpenIDSignIn = sec.Key("ENABLE_OPENID_SIGNIN").MustBool(true) - Service.EnableOpenIDSignUp = sec.Key("ENABLE_OPENID_SIGNUP").MustBool(!Service.DisableRegistration) + Service.EnableOpenIDSignIn = sec.Key("ENABLE_OPENID_SIGNIN").MustBool(false) + Service.EnableOpenIDSignUp = sec.Key("ENABLE_OPENID_SIGNUP").MustBool(!Service.DisableRegistration && Service.EnableOpenIDSignIn) pats := sec.Key("WHITELISTED_URIS").Strings(" ") if len(pats) != 0 { Service.OpenIDWhitelist = make([]*regexp.Regexp, len(pats)) |