conf: overhaul auth and user settings (#5942)

* 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

View File

@@ -10,9 +10,9 @@ import (
api "github.com/gogs/go-gogs-client"
"gogs.io/gogs/internal/conf"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/conf"
)
func ListEmails(c *context.APIContext) {
@@ -39,7 +39,7 @@ func AddEmail(c *context.APIContext, form api.CreateEmailOption) {
emails[i] = &db.EmailAddress{
UID: c.User.ID,
Email: form.Emails[i],
IsActivated: !conf.Service.RegisterEmailConfirm,
IsActivated: !conf.Auth.RequireEmailConfirmation,
}
}