From 2ea8c9de6095cee21dd5f407046281bdce971c01 Mon Sep 17 00:00:00 2001 From: damocles Date: Sat, 21 Nov 2026 13:25:44 +0100 Subject: [PATCH] docs: controller merge gate paragraph without passive voice --- docs/4-implementation/swarm/controller.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/4-implementation/swarm/controller.md b/docs/4-implementation/swarm/controller.md index b9c8fdf3b..38f71336a 100644 --- a/docs/4-implementation/swarm/controller.md +++ b/docs/4-implementation/swarm/controller.md @@ -393,12 +393,12 @@ one per hive. It ensures them at start and every five minutes after owner org; - the empty `operators` merge-gate team in `agents` and `agent-configs`; - the `main` merge gate on every `agent-configs` repo: merge and approval - whitelists = the `operators` team, and no user, and the `swarm-builder` - commit status must have passed (it is the only required status). The - controller leaves a repo with no `main` rule alone; + whitelists = the `operators` team, and no user. The `swarm-builder` + commit status has to pass before a merge, and no other status is + required. The controller leaves a repo with no `main` rule alone; - 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 - branch can be brought onto `main`. The other merge styles stay as the + the default merge style, and rebase stays on, so an operator can rebase + an out-of-date PR branch onto `main`. The other merge styles stay as the repo has them; - the pull-mirrors from `deploy.forgejo.mirrors` on the controller's host (with the `actions/checkout` and `actions/upload-artifact` ones