diff options
| author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-02-22 09:05:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 09:05:26 +0800 |
| commit | 648d9e253c1924b832248f26fee42b2fb64dc3bc (patch) | |
| tree | 51649fad974cd7284a47d30e412c90e7ab72cd2c /internal/route/api/v1/user | |
| parent | 5b14cc6f0b7b661beb2640a94bd15660cdb48587 (diff) | |
conf: overhaul server settings (#5928)
* conf: rename package
* Requires Go 1.12
* Fix lint
* Fix lint
* Overhaul
* db: fix tests
* Save my work
* Fix tests
* Server.UnixSocketPermission
* Server.LocalRootURL
* SSH settings
* Server.OfflineMode
* Save my work
* App.Version
* Remove [server] STATIC_ROOT_PATH
* Server.LandingURL
Diffstat (limited to 'internal/route/api/v1/user')
| -rw-r--r-- | internal/route/api/v1/user/email.go | 4 | ||||
| -rw-r--r-- | internal/route/api/v1/user/key.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/internal/route/api/v1/user/email.go b/internal/route/api/v1/user/email.go index e4baaefa..b45c716d 100644 --- a/internal/route/api/v1/user/email.go +++ b/internal/route/api/v1/user/email.go @@ -12,7 +12,7 @@ import ( "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" - "gogs.io/gogs/internal/setting" + "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: !setting.Service.RegisterEmailConfirm, + IsActivated: !conf.Service.RegisterEmailConfirm, } } diff --git a/internal/route/api/v1/user/key.go b/internal/route/api/v1/user/key.go index 9cdb4e20..759f9008 100644 --- a/internal/route/api/v1/user/key.go +++ b/internal/route/api/v1/user/key.go @@ -10,10 +10,10 @@ import ( repo2 "gogs.io/gogs/internal/route/api/v1/repo" "net/http" + "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" "gogs.io/gogs/internal/db/errors" - "gogs.io/gogs/internal/setting" ) func GetUserByParamsName(c *context.APIContext, name string) *db.User { @@ -31,7 +31,7 @@ func GetUserByParams(c *context.APIContext) *db.User { } func composePublicKeysAPILink() string { - return setting.AppURL + "api/v1/user/keys/" + return conf.Server.ExternalURL + "api/v1/user/keys/" } func listPublicKeys(c *context.APIContext, uid int64) { |