summaryrefslogtreecommitdiffstats
path: root/options
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 /options
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 'options')
-rw-r--r--options/locale/locale_en-US.ini2
1 files changed, 2 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 2251075963..80260d4b7d 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1211,6 +1211,8 @@ config.db_path_helper = (for "sqlite3" and "tidb")
config.service_config = Service Configuration
config.register_email_confirm = Require Email Confirmation
config.disable_register = Disable Registration
+config.enable_openid_signup = Enable Registration via OpenID
+config.enable_openid_signin = Enable OpenID Sign In
config.show_registration_button = Show Register Button
config.require_sign_in_view = Require Sign In View
config.mail_notify = Mail Notification