aboutsummaryrefslogtreecommitdiffstats
path: root/conf/app.ini
diff options
context:
space:
mode:
authorSandro Santilli <strk@kbt.io>2017-03-29 12:57:43 +0200
committerBo-Yi Wu <appleboy.tw@gmail.com>2017-03-29 18:57:43 +0800
commit129b0d6a4b408555c579e7ccb2fb15d3d8fcef29 (patch)
tree88912e81e84c11f1ee7993b9409bf50a23aa7aef /conf/app.ini
parent08f7fded3c097685af9370283fc8565b80fb0615 (diff)
downloadgitea-129b0d6a4b408555c579e7ccb2fb15d3d8fcef29.tar.gz
gitea-129b0d6a4b408555c579e7ccb2fb15d3d8fcef29.zip
Allow ENABLE_OPENID_SIGNUP to depend on DISABLE_REGISTRATION (#1369)
* Allow ENABLE_OPENID_SIGNUP to depend on DISABLE_REGISTRATION Omit the configuration variable (the default) to be dependent. Fixes #1363 * Move OpenID settings under Service object * Show OpenID SignUp and SignIn status in admin panel / configuration
Diffstat (limited to 'conf/app.ini')
-rw-r--r--conf/app.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/app.ini b/conf/app.ini
index 32791ed162..07c3a1d21c 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -203,7 +203,8 @@ IMPORT_LOCAL_PATHS = false
; Whether to allow signin in via OpenID
ENABLE_OPENID_SIGNIN = true
; Whether to allow registering via OpenID
-ENABLE_OPENID_SIGNUP = true
+; Do not include to rely on DISABLE_REGISTRATION setting
+;ENABLE_OPENID_SIGNUP = true
; Allowed URI patterns (POSIX regexp).
; Space separated.
; Only these would be allowed if non-blank.