mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-03-30 16:09:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'origin/main' into 'next-release/main'

Browse source
This commit is contained in:
oauth 2024-09-20 21:23:52 +00:00
commit ea132352e8
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.woodpecker/web.yaml
View file

@ -58,6 +58,7 @@ steps:
test: test:
depends_on: depends_on:
- install-dependencies - install-dependencies
- format-check # wait for it else test artifacts are falsely detected as wrong
image: *node_image image: *node_image
directory: web/ directory: web/
commands: commands:

10
server/api/repo.go
View file

@ -615,10 +615,14 @@ func repairRepo(c *gin.Context, repo *model.Repo, withPerms, skipOnErr bool) {
user, err := _store.GetUser(repo.UserID) user, err := _store.GetUser(repo.UserID)
if err != nil { if err != nil {
if errors.Is(err, types.RecordNotExist) { if errors.Is(err, types.RecordNotExist) {
if !skipOnErr { oldUserID := repo.UserID
c.AbortWithStatus(http.StatusNotFound) user = session.User(c)
repo.UserID = user.ID
err = _store.UpdateRepo(repo)
if err != nil {
_ = c.AbortWithError(http.StatusInternalServerError, err)
} }
log.Error().Err(err).Msg("could not get user on repo repair") log.Debug().Msgf("Could not find repo user with ID %d during repo repair, set to repair request user with ID %d", oldUserID, user.ID)
} else { } else {
_ = c.AbortWithError(http.StatusInternalServerError, err) _ = c.AbortWithError(http.StatusInternalServerError, err)
} }