docs: controller merge gate paragraph without passive voice
This commit is contained in:
parent
7a7041452e
commit
2ea8c9de60
1 changed files with 5 additions and 5 deletions
|
|
@ -393,12 +393,12 @@ one per hive. It ensures them at start and every five minutes after
|
||||||
owner org;
|
owner org;
|
||||||
- the empty `operators` merge-gate team in `agents` and `agent-configs`;
|
- the empty `operators` merge-gate team in `agents` and `agent-configs`;
|
||||||
- the `main` merge gate on every `agent-configs` repo: merge and approval
|
- the `main` merge gate on every `agent-configs` repo: merge and approval
|
||||||
whitelists = the `operators` team, and no user, and the `swarm-builder`
|
whitelists = the `operators` team, and no user. The `swarm-builder`
|
||||||
commit status must have passed (it is the only required status). The
|
commit status has to pass before a merge, and no other status is
|
||||||
controller leaves a repo with no `main` rule alone;
|
required. The controller leaves a repo with no `main` rule alone;
|
||||||
- the merge settings of every `agent-configs` repo: fast-forward-only is
|
- the merge settings of every `agent-configs` repo: fast-forward-only is
|
||||||
the default merge style, and rebase is allowed so an out-of-date PR
|
the default merge style, and rebase stays on, so an operator can rebase
|
||||||
branch can be brought onto `main`. The other merge styles stay as the
|
an out-of-date PR branch onto `main`. The other merge styles stay as the
|
||||||
repo has them;
|
repo has them;
|
||||||
- the pull-mirrors from `deploy.forgejo.mirrors` on the controller's
|
- the pull-mirrors from `deploy.forgejo.mirrors` on the controller's
|
||||||
host (with the `actions/checkout` and `actions/upload-artifact` ones
|
host (with the `actions/checkout` and `actions/upload-artifact` ones
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue