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

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

View file

@ -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:

View file

@ -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)
}