Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-12-21 07:39:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

conf: overhaul auth and user settings (#5942)

Browse Source 
* conf: overhaul auth and user settings

* ci: update travis Go versions
This commit is contained in:
ᴜɴᴋɴᴡᴏɴ
2020-02-27 18:06:38 +08:00
committed by GitHub
parent cf3d55fa10
commit 7950f2d17d
27 changed files with 242 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/context/auth.go
View File

@@ -71,7 +71,7 @@ func Toggle(options *ToggleOptions) macaron.Handler {
c.SetCookie("redirect_to", url.QueryEscape(conf.Server.Subpath+c.Req.RequestURI), 0, conf.Server.Subpath)
c.Redirect(conf.Server.Subpath + "/user/login")
return
} else if !c.User.IsActive && conf.Service.RegisterEmailConfirm {
} else if !c.User.IsActive && conf.Auth.RequireEmailConfirmation {
c.Data["Title"] = c.Tr("auth.active_your_account")
c.HTML(200, "user/auth/activate")
return