Compare commits

..

2 Commits

Author SHA1 Message Date
Giteabot
37bf5e761a
Fix bug when change user name (#25637) (#25645)
Backport #25637 by @lunny

Fix #25621

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-03 17:00:44 -04:00
silverwind
45d8d63621
Remove -v from vulncheck (#23953) (#25654)
Backport https://github.com/go-gitea/gitea/pull/23953 to 1.19 to fix the
branch build:

https://drone.gitea.io/go-gitea/gitea/75155/1/9

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
2023-07-03 16:16:23 -04:00
2 changed files with 5 additions and 1 deletions

View File

@ -751,7 +751,7 @@ generate-go: $(TAGS_PREREQ)
.PHONY: security-check .PHONY: security-check
security-check: security-check:
go run $(GOVULNCHECK_PACKAGE) -v ./... go run $(GOVULNCHECK_PACKAGE) ./...
$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ) $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@

View File

@ -64,6 +64,10 @@ func NewUserRedirect(ctx context.Context, ID int64, oldUserName, newUserName str
oldUserName = strings.ToLower(oldUserName) oldUserName = strings.ToLower(oldUserName)
newUserName = strings.ToLower(newUserName) newUserName = strings.ToLower(newUserName)
if err := DeleteUserRedirect(ctx, oldUserName); err != nil {
return err
}
if err := DeleteUserRedirect(ctx, newUserName); err != nil { if err := DeleteUserRedirect(ctx, newUserName); err != nil {
return err return err
} }