forked from Gitlink/gitea-1120-rc1
Fix #222
This commit is contained in:
parent
ddb7f55035
commit
2657f88d9a
2
gogs.go
2
gogs.go
|
@ -17,7 +17,7 @@ import (
|
|||
"github.com/gogits/gogs/modules/setting"
|
||||
)
|
||||
|
||||
const APP_VER = "0.4.0.0530 Alpha"
|
||||
const APP_VER = "0.4.0.0531 Alpha"
|
||||
|
||||
func init() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
|
|
|
@ -67,7 +67,6 @@ func NewOauthService() {
|
|||
TokenURL: setting.OauthService.OauthInfos[name].TokenUrl,
|
||||
}
|
||||
}
|
||||
|
||||
enabledOauths := make([]string, 0, 10)
|
||||
|
||||
// GitHub.
|
||||
|
|
|
@ -26,6 +26,11 @@ func SignIn(ctx *middleware.Context) {
|
|||
return
|
||||
}
|
||||
|
||||
if setting.OauthService != nil {
|
||||
ctx.Data["OauthEnabled"] = true
|
||||
ctx.Data["OauthService"] = setting.OauthService
|
||||
}
|
||||
|
||||
// Check auto-login.
|
||||
userName := ctx.GetCookie(setting.CookieUserName)
|
||||
if len(userName) == 0 {
|
||||
|
@ -33,11 +38,6 @@ func SignIn(ctx *middleware.Context) {
|
|||
return
|
||||
}
|
||||
|
||||
if setting.OauthService != nil {
|
||||
ctx.Data["OauthEnabled"] = true
|
||||
ctx.Data["OauthService"] = setting.OauthService
|
||||
}
|
||||
|
||||
isSucceed := false
|
||||
defer func() {
|
||||
if !isSucceed {
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.4.0.0530 Alpha
|
||||
0.4.0.0531 Alpha
|
Loading…
Reference in New Issue