From 90eb9fb889e5d3a5845576dbc63e3792f3da33f2 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 11 Nov 2021 15:03:30 +0800 Subject: Move EmailAddress & UserRedirect into models/user/ (#17607) * Move EmailAddress into models/user/ * Fix test * rename user_mail to user_email * Fix test * Move UserRedirect into models/user/ * Fix lint & test * Fix lint * Fix lint * remove nolint comment * Fix lint --- routers/web/repo/http.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'routers/web/repo') diff --git a/routers/web/repo/http.go b/routers/web/repo/http.go index 7c5dcd42be..0626d08a7c 100644 --- a/routers/web/repo/http.go +++ b/routers/web/repo/http.go @@ -23,6 +23,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/login" "code.gitea.io/gitea/models/unit" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" @@ -112,7 +113,7 @@ func httpBase(ctx *context.Context) (h *serviceHandler) { owner, err := models.GetUserByName(username) if err != nil { if models.IsErrUserNotExist(err) { - if redirectUserID, err := models.LookupUserRedirect(username); err == nil { + if redirectUserID, err := user_model.LookupUserRedirect(username); err == nil { context.RedirectToUser(ctx, username, redirectUserID) } else { ctx.NotFound(fmt.Sprintf("User %s does not exist", username), nil) -- cgit v1.2.3