diff options
| author | Sandro Santilli <strk@kbt.io> | 2017-03-29 12:57:43 +0200 |
|---|---|---|
| committer | Bo-Yi Wu <appleboy.tw@gmail.com> | 2017-03-29 18:57:43 +0800 |
| commit | 129b0d6a4b408555c579e7ccb2fb15d3d8fcef29 (patch) | |
| tree | 88912e81e84c11f1ee7993b9409bf50a23aa7aef /modules/context/context.go | |
| parent | 08f7fded3c097685af9370283fc8565b80fb0615 (diff) | |
| download | gitea-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 'modules/context/context.go')
| -rw-r--r-- | modules/context/context.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/context/context.go b/modules/context/context.go index 52e50af6a1..e96bf5bd3f 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -197,7 +197,7 @@ func Contexter() macaron.Handler { ctx.Data["ShowRegistrationButton"] = setting.Service.ShowRegistrationButton ctx.Data["ShowFooterBranding"] = setting.ShowFooterBranding ctx.Data["ShowFooterVersion"] = setting.ShowFooterVersion - ctx.Data["EnableOpenIDSignIn"] = setting.EnableOpenIDSignIn + ctx.Data["EnableOpenIDSignIn"] = setting.Service.EnableOpenIDSignIn c.Map(ctx) } |