mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-03-13 16:02:41 +00:00
Merge branch 'origin/main' into 'next-release/main'
This commit is contained in:
commit
ea132352e8
2 changed files with 8 additions and 3 deletions
|
@ -58,6 +58,7 @@ steps:
|
|||
test:
|
||||
depends_on:
|
||||
- install-dependencies
|
||||
- format-check # wait for it else test artifacts are falsely detected as wrong
|
||||
image: *node_image
|
||||
directory: web/
|
||||
commands:
|
||||
|
|
|
@ -615,10 +615,14 @@ func repairRepo(c *gin.Context, repo *model.Repo, withPerms, skipOnErr bool) {
|
|||
user, err := _store.GetUser(repo.UserID)
|
||||
if err != nil {
|
||||
if errors.Is(err, types.RecordNotExist) {
|
||||
if !skipOnErr {
|
||||
c.AbortWithStatus(http.StatusNotFound)
|
||||
oldUserID := repo.UserID
|
||||
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 {
|
||||
_ = c.AbortWithError(http.StatusInternalServerError, err)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue