diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-04-14 14:50:37 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-04-14 14:50:37 +0800 |
| commit | 8283e16ef7af197ee77b1be412bf875ae97c789e (patch) | |
| tree | c145517a3b885c49408f35e0cb9c9aabe6201a35 /routers/admin/admin.go | |
| parent | 6cee65db5a6e6ef7372f19d45c22a416e130afed (diff) | |
| parent | f644cefa865c04b440902695ba90114b224c640d (diff) | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'routers/admin/admin.go')
| -rw-r--r-- | routers/admin/admin.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 18a43ff8..d0f737e6 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -153,6 +153,12 @@ func Config(ctx *middleware.Context) { ctx.Data["Mailer"] = base.MailService } + ctx.Data["OauthEnabled"] = false + if base.OauthService != nil { + ctx.Data["OauthEnabled"] = true + ctx.Data["Oauther"] = base.OauthService + } + ctx.Data["CacheAdapter"] = base.CacheAdapter ctx.Data["CacheConfig"] = base.CacheConfig |