aboutsummaryrefslogtreecommitdiffstats
path: root/models/pull/automerge.go
diff options
context:
space:
mode:
Diffstat (limited to 'models/pull/automerge.go')
-rw-r--r--models/pull/automerge.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/models/pull/automerge.go b/models/pull/automerge.go
index 3cafacc3a4..7f940a9849 100644
--- a/models/pull/automerge.go
+++ b/models/pull/automerge.go
@@ -5,12 +5,14 @@ package pull
import (
"context"
+ "errors"
"fmt"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/timeutil"
+ "code.gitea.io/gitea/modules/util"
)
// AutoMerge represents a pull request scheduled for merging when checks succeed
@@ -76,7 +78,10 @@ func GetScheduledMergeByPullID(ctx context.Context, pullID int64) (bool, *AutoMe
return false, nil, err
}
- doer, err := user_model.GetUserByID(ctx, scheduledPRM.DoerID)
+ doer, err := user_model.GetPossibleUserByID(ctx, scheduledPRM.DoerID)
+ if errors.Is(err, util.ErrNotExist) {
+ doer, err = user_model.NewGhostUser(), nil
+ }
if err != nil {
return false, nil, err
}
d='n132' href='#n132'>132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163