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

log: migrate to unknwon.dev/clog/v2 (#5927)

Browse Source 
* Add unknwon.dev/clog/v2

* Update all places
This commit is contained in:
ᴜɴᴋɴᴡᴏɴ
2020-02-20 02:25:02 +08:00
committed by GitHub
parent 422a206484
commit 1c09373b4f
71 changed files with 583 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/route/api/v1/admin/user.go
View File

@@ -5,10 +5,9 @@
package admin
import (
user2 "gogs.io/gogs/internal/route/api/v1/user"
"net/http"
log "gopkg.in/clog.v1"
log "unknwon.dev/clog/v2"
api "github.com/gogs/go-gogs-client"
@@ -16,6 +15,7 @@ import (
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/db/errors"
"gogs.io/gogs/internal/mailer"
"gogs.io/gogs/internal/route/api/v1/user"
"gogs.io/gogs/internal/setting"
)
@@ -76,7 +76,7 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) {
}
func EditUser(c *context.APIContext, form api.EditUserOption) {
u := user2.GetUserByParams(c)
u := user.GetUserByParams(c)
if c.Written() {
return
}
@@ -131,7 +131,7 @@ func EditUser(c *context.APIContext, form api.EditUserOption) {
}
func DeleteUser(c *context.APIContext) {
u := user2.GetUserByParams(c)
u := user.GetUserByParams(c)
if c.Written() {
return
}
@@ -151,9 +151,9 @@ func DeleteUser(c *context.APIContext) {
}
func CreatePublicKey(c *context.APIContext, form api.CreateKeyOption) {
u := user2.GetUserByParams(c)
u := user.GetUserByParams(c)
if c.Written() {
return
}
user2.CreateUserPublicKey(c, form, u.ID)
user.CreateUserPublicKey(c, form, u.ID)
}