bjoernager/forgejo
bjoernager/forgejo
1
Fork 0
Code Activity

Fix misspelling of mergable (#30896)

Browse source 
https://github.com/go-gitea/gitea/pull/25812#issuecomment-2099833692
Follow #30573

(cherry picked from commit f7d2f695a4c57b245830a526e77fa62e99e00254)

Conflicts:
	services/pull/check.go
	trivial conflict because
	  9b2536b78fdcd3cf444a2f54857d9871e153858f Update misspell to 0.5.1 and add `misspellings.csv` (#30573)
	was not cherry-picked
This commit is contained in:
yp05327 2024-05-09 01:11:43 +09:00 • committed by Earl Warren
parent 8f0f6bf89c
commit 6c9b8401f9
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
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
}