diff options
author | Unknown <joe2010xtmf@163.com> | 2014-04-11 21:47:43 -0400 |
---|---|---|
committer | Unknown <joe2010xtmf@163.com> | 2014-04-11 21:47:43 -0400 |
commit | 4fc5dcc7648c9e01e05f9dbf08e930ba325839d9 (patch) | |
tree | 34bc4d3cc3ce0edf0ee139605c966d0199d14eb3 /web.go | |
parent | 33aa4f74380ab117673a1cc30bead3a7f2b3cb4b (diff) | |
parent | f8e97b75fbe7201830413fabead33967fb690827 (diff) | |
download | gitea-4fc5dcc7648c9e01e05f9dbf08e930ba325839d9.tar.gz gitea-4fc5dcc7648c9e01e05f9dbf08e930ba325839d9.zip |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'web.go')
-rw-r--r-- | web.go | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -20,7 +20,6 @@ import ( "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" - "github.com/gogits/gogs/modules/oauth2" "github.com/gogits/gogs/routers" "github.com/gogits/gogs/routers/admin" "github.com/gogits/gogs/routers/api/v1" @@ -59,17 +58,6 @@ func runWeb(*cli.Context) { m.Use(middleware.Renderer(middleware.RenderOptions{Funcs: []template.FuncMap{base.TemplateFuncs}})) m.Use(middleware.InitContext()) - if base.OauthService != nil { - if base.OauthService.GitHub.Enabled { - m.Use(oauth2.Github(&oauth2.Options{ - ClientId: base.OauthService.GitHub.ClientId, - ClientSecret: base.OauthService.GitHub.ClientSecret, - RedirectURL: base.AppUrl + oauth2.PathCallback[1:], - Scopes: []string{base.OauthService.GitHub.Scopes}, - })) - } - } - reqSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true}) ignSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: base.Service.RequireSignInView}) ignSignInAndCsrf := middleware.Toggle(&middleware.ToggleOptions{ |