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 /cmd/web.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 'cmd/web.go')
| -rw-r--r-- | cmd/web.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/web.go b/cmd/web.go index 3a20191bc5..1f2561ca68 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -200,7 +200,7 @@ func runWeb(ctx *cli.Context) error { m.Group("/user", func() { m.Get("/login", user.SignIn) m.Post("/login", bindIgnErr(auth.SignInForm{}), user.SignInPost) - if setting.EnableOpenIDSignIn { + if setting.Service.EnableOpenIDSignIn { m.Combo("/login/openid"). Get(user.SignInOpenID). Post(bindIgnErr(auth.SignInOpenIDForm{}), user.SignInOpenIDPost) @@ -243,7 +243,7 @@ func runWeb(ctx *cli.Context) error { m.Post("/email/delete", user.DeleteEmail) m.Get("/password", user.SettingsPassword) m.Post("/password", bindIgnErr(auth.ChangePasswordForm{}), user.SettingsPasswordPost) - if setting.EnableOpenIDSignIn { + if setting.Service.EnableOpenIDSignIn { m.Group("/openid", func() { m.Combo("").Get(user.SettingsOpenID). Post(bindIgnErr(auth.AddOpenIDForm{}), user.SettingsOpenIDPost) |