finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #222

Browse source
This commit is contained in:
Unknown 2014-05-31 17:15:04 -04:00
parent ddb7f55035
commit 2657f88d9a
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gogs.go
View file

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.4.0.0530 Alpha" const APP_VER = "0.4.0.0531 Alpha"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

1
modules/social/social.go
View file

@ -67,7 +67,6 @@ func NewOauthService() {
TokenURL: setting.OauthService.OauthInfos[name].TokenUrl, TokenURL: setting.OauthService.OauthInfos[name].TokenUrl,
} }
} }
enabledOauths := make([]string, 0, 10) enabledOauths := make([]string, 0, 10)
// GitHub. // GitHub.

10
routers/user/user.go
View file

@ -26,6 +26,11 @@ func SignIn(ctx *middleware.Context) {
return return
} }
if setting.OauthService != nil {
ctx.Data["OauthEnabled"] = true
ctx.Data["OauthService"] = setting.OauthService
}
// Check auto-login. // Check auto-login.
userName := ctx.GetCookie(setting.CookieUserName) userName := ctx.GetCookie(setting.CookieUserName)
if len(userName) == 0 { if len(userName) == 0 {
@ -33,11 +38,6 @@ func SignIn(ctx *middleware.Context) {
return return
} }
if setting.OauthService != nil {
ctx.Data["OauthEnabled"] = true
ctx.Data["OauthService"] = setting.OauthService
}
isSucceed := false isSucceed := false
defer func() { defer func() {
if !isSucceed { if !isSucceed {

2
templates/VERSION
View file

@ -1 +1 @@
0.4.0.0530 Alpha 0.4.0.0531 Alpha