mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-10 06:39:06 +02:00
Refactor pull request view (3) (#37439)
Move some complex logic to backend Rename `pr.CanAutoMerge` to `pr.IsStatusMergeable`
This commit is contained in:
1 parent
29c510ef94
commit
55c9b936cb
7 files changed
+123
-72
No files matched your search
@@ -168,7 +168,7 @@ func CheckPullMergeable(stdCtx context.Context, doer *user_model.User, perm *acc
|
||||
return ErrIsWorkInProgress
|
||||
}
|
||||
|
||||
if !pr.CanAutoMerge() && !pr.IsEmpty() {
|
||||
if !pr.IsStatusMergeable() && !pr.IsEmpty() {
|
||||
return ErrNotMergeableState
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user