mirror of
https://git.vectorsigma.ru/public/atlantis.git
synced 2026-08-05 17:08:33 +00:00
Update approved requirement documentation to be consistent
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
Atlantis allows you to require certain conditions be satisfied **before** an `atlantis apply`
|
||||
command can be run:
|
||||
|
||||
* [Approved](#approved) – requires pull requests to be approved by at least one user
|
||||
* [Approved](#approved) – requires pull requests to be approved by at least one user other than the author
|
||||
* [Mergeable](#mergeable) – requires pull requests to be able to be merged
|
||||
|
||||
## What Happens If The Requirement Is Not Met?
|
||||
|
||||
@@ -234,7 +234,7 @@ func (p *DefaultProjectCommandRunner) doApply(ctx models.ProjectCommandContext)
|
||||
return "", "", errors.Wrap(err, "checking if pull request was approved")
|
||||
}
|
||||
if !approved {
|
||||
return "", "Pull request must be approved before running apply.", nil
|
||||
return "", "Pull request must be approved by at least one person other than the author before running apply.", nil
|
||||
}
|
||||
case raw.MergeableApplyRequirement:
|
||||
if !ctx.PullMergeable {
|
||||
|
||||
@@ -162,7 +162,7 @@ func TestDefaultProjectCommandRunner_ApplyNotApproved(t *testing.T) {
|
||||
When(mockApproved.PullIsApproved(ctx.BaseRepo, ctx.Pull)).ThenReturn(false, nil)
|
||||
|
||||
res := runner.Apply(ctx)
|
||||
Equals(t, "Pull request must be approved before running apply.", res.Failure)
|
||||
Equals(t, "Pull request must be approved by at least one person other than the author before running apply.", res.Failure)
|
||||
}
|
||||
|
||||
// Test that if mergeable is required and the PR isn't mergeable we give an error.
|
||||
|
||||
Reference in New Issue
Block a user