diff options
| author | 6543 <6543@obermui.de> | 2022-05-02 01:54:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-02 01:54:44 +0200 |
| commit | d8905cb623cf55194eec5f1ed97fdc7bb30ff1cb (patch) | |
| tree | 0027fccb3c7ffe4bc5b5144998d08320c41fa3e4 /services/pull/merge.go | |
| parent | 3725fa28ccc01ab08060f591f894ea6443a348e8 (diff) | |
| download | gitea-d8905cb623cf55194eec5f1ed97fdc7bb30ff1cb.tar.gz gitea-d8905cb623cf55194eec5f1ed97fdc7bb30ff1cb.zip | |
Dont overwrite err with nil & rename PullCheckingFuncs to reflect there usage (#19572)
- dont overwrite err with nil unintentionaly
- rename CheckPRReadyToMerge to CheckPullBranchProtections
- rename prQueue to prPatchCheckerQueue
from #9307
Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'services/pull/merge.go')
| -rw-r--r-- | services/pull/merge.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go index 7967bce6a9..330dffd5c7 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -662,8 +662,8 @@ func IsUserAllowedToMerge(pr *models.PullRequest, p models.Permission, user *use return false, nil } -// CheckPRReadyToMerge checks whether the PR is ready to be merged (reviews and status checks) -func CheckPRReadyToMerge(ctx context.Context, pr *models.PullRequest, skipProtectedFilesCheck bool) (err error) { +// CheckPullBranchProtections checks whether the PR is ready to be merged (reviews and status checks) +func CheckPullBranchProtections(ctx context.Context, pr *models.PullRequest, skipProtectedFilesCheck bool) (err error) { if err = pr.LoadBaseRepoCtx(ctx); err != nil { return fmt.Errorf("LoadBaseRepo: %v", err) } |