tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Fix misspelling of mergable (#30896)

Browse Source 
https://github.com/go-gitea/gitea/pull/25812#issuecomment-2099833692
Follow #30573
This commit is contained in:
yp05327
2024-05-09 01:11:43 +09:00
committed by GitHub
parent 3fdb2d4ad8
commit f7d2f695a4
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/automerge/automerge.go
View File

@@ -229,12 +229,12 @@ func handlePull(pullID int64, sha string) {
return
}
if err := pull_service.CheckPullMergable(ctx, doer, &perm, pr, pull_service.MergeCheckTypeGeneral, false); err != nil {
if err := pull_service.CheckPullMergeable(ctx, doer, &perm, pr, pull_service.MergeCheckTypeGeneral, false); err != nil {
if errors.Is(pull_service.ErrUserNotAllowedToMerge, err) {
log.Info("%-v was scheduled to automerge by an unauthorized user", pr)
return
}
log.Error("%-v CheckPullMergable: %v", pr, err)
log.Error("%-v CheckPullMergeable: %v", pr, err)
return
}