#23 feat(merge): mr ready, passing checks to merge, mr:force-merge and --ignore-checks

M docs/ci.md +1 -1


@@ -44,7 +44,7 @@ Like `gh workflow disable`: a disabled workflow starts no run for any event (`pu
44	44		- A disabled reusable workflow (`on: workflow_call`) can still be called with `uses:` from an enabled workflow: it then runs inside the caller's run, not as a run of its own, as on GitHub. Disable the caller to stop it.
45	45		- The state is checked again in the transaction that stores a run, so a disable takes effect for every run not yet stored, even one being planned at that moment.
46	46
47		-	The Actions tab of a repository shows the same. With `failing_checks_block` on (default), a merge waits for every check to pass. Turn it off with `ermite repo edit <repo> --failing-checks-block=false`.
	47	+	The Actions tab of a repository shows the same. A merge needs passing checks on the head: none failed, queued or running. A head with no checks can merge. `ermite mr merge <repo> <n> --head <id> --ignore-checks` bypasses checks, needs `mr:force-merge`, and cannot be combined with `--auto`.
48	48
49	49		## Trust
50	50


@@ -44,7 +44,7 @@ Like `gh workflow disable`: a disabled workflow starts no run for any event (`pu
44		- A disabled reusable workflow (`on: workflow_call`) can still be called with `uses:` from an enabled workflow: it then runs inside the caller's run, not as a run of its own, as on GitHub. Disable the caller to stop it.	44		- A disabled reusable workflow (`on: workflow_call`) can still be called with `uses:` from an enabled workflow: it then runs inside the caller's run, not as a run of its own, as on GitHub. Disable the caller to stop it.
45		- The state is checked again in the transaction that stores a run, so a disable takes effect for every run not yet stored, even one being planned at that moment.	45		- The state is checked again in the transaction that stores a run, so a disable takes effect for every run not yet stored, even one being planned at that moment.
46			46
47	-	The Actions tab of a repository shows the same. With `failing_checks_block` on (default), a merge waits for every check to pass. Turn it off with `ermite repo edit <repo> --failing-checks-block=false`.	47	+	The Actions tab of a repository shows the same. A merge needs passing checks on the head: none failed, queued or running. A head with no checks can merge. `ermite mr merge <repo> <n> --head <id> --ignore-checks` bypasses checks, needs `mr:force-merge`, and cannot be combined with `--auto`.
48			48
49		## Trust	49		## Trust
50			50

M docs/cli.md +4 -2


@@ -48,7 +48,7 @@ It does not run:
48	48
49	49		```sh
50	50		ermite repo list \| show <name> \| create <name> [--description …] [--visibility public]
51		-	ermite repo edit <name> [--description …] [--visibility …] [--default-branch …] [--merge-modes …] [--failing-checks-block=false] [--allow-auto-merge] [--issues off\|owner\|public]
	51	+	ermite repo edit <name> [--description …] [--visibility …] [--default-branch …] [--merge-modes …] [--allow-auto-merge] [--issues off\|owner\|public]
52	52		ermite repo delete <name> [--yes]
53	53
54	54		ermite token create <label> [--preset cli\|agent\|ci\|runner] [--scope …] [--repo …] [--branch-prefix …] [--expires 30d]

@@ -57,7 +57,8 @@ ermite token list \| revoke <id>
57	57		ermite mr create <repo> --source <branch> --title … \| list <repo> \| show <repo> <n> [--diff] # show prints the mergeability: up to date, behind, conflict
58	58		ermite mr comment <repo> <n> -m … [--path … --line N\|A-B --side old\|new] [--reply <id>] [--approve\|--request-changes]
59	59		ermite mr resolve <repo> <n> <comment> \| edit-comment <repo> <n> <comment> -m … \| delete-comment <repo> <n> <comment>
60		-	ermite mr merge <repo> <n> --head <id> [--mode fast-forward\|squash\|merge] [--delete-branch] \| merge <repo> <n> --head <id> --auto [--mode …] \| merge <repo> <n> --cancel-auto \| close <repo> <n>
	60	+	ermite mr ready <repo> <n> # removes WIP:/[WIP], needs mr:write
	61	+	ermite mr merge <repo> <n> --head <id> [--mode fast-forward\|squash\|merge] [--delete-branch] [--ignore-checks] \| merge <repo> <n> --head <id> --auto [--mode …] \| merge <repo> <n> --cancel-auto \| close <repo> <n>
61	62
62	63		ermite issue create <repo> --title … [--body … \| --body-file …] \| list <repo> [--state open\|closed\|all]
63	64		ermite issue show <repo> <n> \| comment <repo> <n> -m … \| close <repo> <n> \| reopen <repo> <n>

@@ -99,6 +100,7 @@ Mirrors push repositories to a remote over SSH, never forcing. See [Push mirror]
99	100
100	101		- `--json` prints stable field names (listed in each `--help`) on `repo list\|show\|create\|edit`, `issue create\|list\|show\|comment\|close\|reopen`, `token create\|list`, `run list\|view\|cancel\|rerun`, `runner list`, `mirror key\|config\|status` and `version`.
101	102		- `watch --json` prints one object per line. `merge_request_mergeability` events carry `mergeability` (`state`, `behind`, `conflict_paths`…) and print as `repo!n mergeability: behind by 2`.
	103	+	- A merge needs passing checks on the head (no failed, queued or running checks); a head with no checks can merge. `mr merge --ignore-checks` bypasses this, needs `mr:force-merge`, and cannot be combined with `--auto` or `--cancel-auto`. The `cli` preset includes `mr:force-merge`; `agent` does not. Adding `--scope mr:merge` lets an agent merge only with passing checks.
102	104		- `mr merge --mode squash\|merge` creates a commit signed by the server's own key (generated on first start); the output names its fingerprint, `ermite signing-key show` prints the key. Every mode is allowed by default; `repo edit --merge-modes fast-forward,squash` disables `merge`.
103	105		- `mr merge --auto` makes the server merge once CI passed on the head (`repo edit --allow-auto-merge` first); `--cancel-auto` cancels it; both are exclusive with each other and `--auto` with `--delete-branch`. `watch --json` adds `merge_request_auto_merge_enabled`, `merge_request_auto_merge_cancelled` (with `reason`), and `auto` (true) on `merge_request_merged` after an auto-merge. See [Merge requests](merge-requests.md#auto-merge).
104	106		- Errors are one line on stderr (`ermite: …`) with exit status 1.

 ```sh
 ermite repo list | show <name> | create <name> [--description …] [--visibility public]
-ermite repo edit <name> [--description …] [--visibility …] [--default-branch …] [--merge-modes …] [--failing-checks-block=false] [--allow-auto-merge] [--issues off|owner|public]
+ermite repo edit <name> [--description …] [--visibility …] [--default-branch …] [--merge-modes …] [--allow-auto-merge] [--issues off|owner|public]
 ermite repo delete <name> [--yes]
 ermite token create <label> [--preset cli|agent|ci|runner] [--scope …] [--repo …] [--branch-prefix …] [--expires 30d]
 ermite mr create <repo> --source <branch> --title … | list <repo> | show <repo> <n> [--diff]   # show prints the mergeability: up to date, behind, conflict
 ermite mr comment <repo> <n> -m … [--path … --line N|A-B --side old|new] [--reply <id>] [--approve|--request-changes]
 ermite mr resolve <repo> <n> <comment> | edit-comment <repo> <n> <comment> -m … | delete-comment <repo> <n> <comment>
-ermite mr merge <repo> <n> --head <id> [--mode fast-forward|squash|merge] [--delete-branch] | merge <repo> <n> --head <id> --auto [--mode …] | merge <repo> <n> --cancel-auto | close <repo> <n>
+ermite mr ready <repo> <n>                 # removes WIP:/[WIP], needs mr:write
+ermite mr merge <repo> <n> --head <id> [--mode fast-forward|squash|merge] [--delete-branch] [--ignore-checks] | merge <repo> <n> --head <id> --auto [--mode …] | merge <repo> <n> --cancel-auto | close <repo> <n>
 ermite issue create <repo> --title … [--body … | --body-file …] | list <repo> [--state open|closed|all]
 ermite issue show <repo> <n> | comment <repo> <n> -m … | close <repo> <n> | reopen <repo> <n>
 - `--json` prints stable field names (listed in each `--help`) on `repo list|show|create|edit`, `issue create|list|show|comment|close|reopen`, `token create|list`, `run list|view|cancel|rerun`, `runner list`, `mirror key|config|status` and `version`.
 - `watch --json` prints one object per line. `merge_request_mergeability` events carry `mergeability` (`state`, `behind`, `conflict_paths`…) and print as `repo!n mergeability: behind by 2`.
+- A merge needs passing checks on the head (no failed, queued or running checks); a head with no checks can merge. `mr merge --ignore-checks` bypasses this, needs `mr:force-merge`, and cannot be combined with `--auto` or `--cancel-auto`. The `cli` preset includes `mr:force-merge`; `agent` does not. Adding `--scope mr:merge` lets an agent merge only with passing checks.
 - `mr merge --mode squash|merge` creates a commit signed by the server's own key (generated on first start); the output names its fingerprint, `ermite signing-key show` prints the key. Every mode is allowed by default; `repo edit --merge-modes fast-forward,squash` disables `merge`.
 - `mr merge --auto` makes the server merge once CI passed on the head (`repo edit --allow-auto-merge` first); `--cancel-auto` cancels it; both are exclusive with each other and `--auto` with `--delete-branch`. `watch --json` adds `merge_request_auto_merge_enabled`, `merge_request_auto_merge_cancelled` (with `reason`), and `auto` (true) on `merge_request_merged` after an auto-merge. See [Merge requests](merge-requests.md#auto-merge).
 - Errors are one line on stderr (`ermite: …`) with exit status 1.

M docs/merge-requests.md +5 -3


@@ -14,6 +14,8 @@ Naming an issue with `#N` links it, and `Fixes #N` closes it on merge: see [issu
14	14		merge request web URL on its own line. With `--json`, merge request objects
15	15		(create, show, list, close and merge) include `url` alongside the other fields.
16	16
	17	+	A draft cannot merge. `ermite mr ready <repo> <n>` removes the `WIP:` or `[WIP]` title prefix; it needs `mr:write` and an open draft.
	18	+
17	19		## Merge modes
18	20
19	21		\| Mode \| Result \| Needs \|

@@ -25,10 +27,10 @@ merge request web URL on its own line. With `--json`, merge request objects
25	27		- The server never rebases. A branch behind its target merges with `squash` or `merge`, or is rebased and pushed again for a fast-forward.
26	28		- The server checks the mode again when it merges, whatever the badge showed, and refuses with the reason (the target moved, a conflict with the paths).
27	29		- The merge is also refused when the branch moved since the reviewed `--head`.
28		-	- With `failing_checks_block` on (default), the merge is refused while a check of the head failed or is still running.
	30	+	- A merge needs passing checks on the head: no failed, queued or running checks. A head with no checks can merge. `--ignore-checks` bypasses this, needs `mr:force-merge`, and cannot be combined with `--auto` or `--cancel-auto`. The owner web merge form offers Ignore checks when checks fail or are pending.
29	31		- The merge answers as soon as the target has moved. `--delete-branch` then deletes the source branch right after, in the background (unless it is the default branch or another open request uses it); if the branch moved meanwhile, it is kept.
30	32		- Every mode is allowed by default, including in repositories that had only `fast-forward` and `squash` before `merge` existed: those gain `merge`. Disable a mode per repository with `ermite repo edit <repo> --merge-modes fast-forward,squash` (list the modes to keep).
31		-	- Scopes: `mr:write` to open and comment, `mr:review` to give a verdict, `mr:merge` to merge.
	33	+	- Scopes: `mr:write` to open and comment, `mr:review` to give a verdict, `mr:merge` to merge, `mr:force-merge` to bypass checks. The `cli` preset includes the bypass scope; `agent` does not. Adding `--scope mr:merge` lets an agent merge only with passing checks.
32	34
33	35		## Signed commits
34	36

@@ -47,7 +49,7 @@ A merge request can merge by itself once its checks passed.
47	49
48	50		- The repository setting `allow_auto_merge` is off by default: `ermite repo edit <repo> --allow-auto-merge` (`=false` to turn it off).
49	51		- Enable it with `ermite mr merge <repo> <n> --head <commit> --auto --mode squash` (`--head` is required, as for a plain merge; a head that moved is refused with "branch moved"), or with Merge when ready in the web merge box. Its separate mode choice offers every repository-allowed mode, even while the head conflicts or is behind. Auto-merge keeps the source branch; the delete-source checkbox applies only to an immediate merge. It needs `mr:merge` and a server with CI. Re-enabling replaces the previous mode and enabler.
50		-	- The server merges when CI has settled on the head with every run complete and at least one check passed. A failing or unfinished check always blocks, whatever `failing_checks_block` says. The mode must still be allowed.
	52	+	- The server merges when CI has settled on the head with every run complete and at least one check passed. A failing or unfinished check always blocks. The mode must still be allowed.
51	53		- The merge is made as the person who enabled it. Their token is checked at every evaluation, even while checks are pending, and again at merge time under the merge lock: it must still be valid and allow `mr:merge` on the repository and the target branch. A token that no longer qualifies cancels the auto-merge.
52	54		- A pending auto-merge shows in `mr show` (`auto_merge`), in the web merge box and as `merge_request_auto_merge_enabled` in `ermite watch`. A merge request merged this way has `auto_merged` true.
53	55		- A failing, unfinished or conflicting head waits with auto-merge still on. A re-run or a target fix can make it pass; pushing a new source head cancels the recorded intent (the reason names the new head).

 merge request web URL on its own line. With `--json`, merge request objects
 (create, show, list, close and merge) include `url` alongside the other fields.
+A draft cannot merge. `ermite mr ready <repo> <n>` removes the `WIP:` or `[WIP]` title prefix; it needs `mr:write` and an open draft.
 ## Merge modes
 | Mode | Result | Needs |
 - The server never rebases. A branch behind its target merges with `squash` or `merge`, or is rebased and pushed again for a fast-forward.
 - The server checks the mode again when it merges, whatever the badge showed, and refuses with the reason (the target moved, a conflict with the paths).
 - The merge is also refused when the branch moved since the reviewed `--head`.
-- With `failing_checks_block` on (default), the merge is refused while a check of the head failed or is still running.
+- A merge needs passing checks on the head: no failed, queued or running checks. A head with no checks can merge. `--ignore-checks` bypasses this, needs `mr:force-merge`, and cannot be combined with `--auto` or `--cancel-auto`. The owner web merge form offers **Ignore checks** when checks fail or are pending.
 - The merge answers as soon as the target has moved. `--delete-branch` then deletes the source branch right after, in the background (unless it is the default branch or another open request uses it); if the branch moved meanwhile, it is kept.
 - Every mode is allowed by default, including in repositories that had only `fast-forward` and `squash` before `merge` existed: those gain `merge`. Disable a mode per repository with `ermite repo edit <repo> --merge-modes fast-forward,squash` (list the modes to keep).
-- Scopes: `mr:write` to open and comment, `mr:review` to give a verdict, `mr:merge` to merge.
+- Scopes: `mr:write` to open and comment, `mr:review` to give a verdict, `mr:merge` to merge, `mr:force-merge` to bypass checks. The `cli` preset includes the bypass scope; `agent` does not. Adding `--scope mr:merge` lets an agent merge only with passing checks.
 ## Signed commits
 - The repository setting `allow_auto_merge` is off by default: `ermite repo edit <repo> --allow-auto-merge` (`=false` to turn it off).
 - Enable it with `ermite mr merge <repo> <n> --head <commit> --auto --mode squash` (`--head` is required, as for a plain merge; a head that moved is refused with "branch moved"), or with **Merge when ready** in the web merge box. Its separate mode choice offers every repository-allowed mode, even while the head conflicts or is behind. Auto-merge keeps the source branch; the delete-source checkbox applies only to an immediate merge. It needs `mr:merge` and a server with CI. Re-enabling replaces the previous mode and enabler.
-- The server merges when CI has settled on the head with every run complete and at least one check passed. A failing or unfinished check always blocks, whatever `failing_checks_block` says. The mode must still be allowed.
+- The server merges when CI has settled on the head with every run complete and at least one check passed. A failing or unfinished check always blocks. The mode must still be allowed.
 - The merge is made as the person who enabled it. Their token is checked at every evaluation, even while checks are pending, and again at merge time under the merge lock: it must still be valid and allow `mr:merge` on the repository and the target branch. A token that no longer qualifies cancels the auto-merge.
 - A pending auto-merge shows in `mr show` (`auto_merge`), in the web merge box and as `merge_request_auto_merge_enabled` in `ermite watch`. A merge request merged this way has `auto_merged` true.
 - A failing, unfinished or conflicting head waits with auto-merge still on. A re-run or a target fix can make it pass; pushing a new source head cancels the recorded intent (the reason names the new head).

M gen/ermite/storage/merge_request.pb.go +9 -5


@@ -344,8 +344,11 @@ func (MergeabilityState) EnumDescriptor() ([]byte, []int) {
344	344		type RepoSettings struct {
345	345		state protoimpl.MessageState `protogen:"open.v1"`
346	346		// Never empty once stored.
347		-	AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.storage.MergeMode" json:"allowed_merge_modes,omitempty"`
348		-	FailingChecksBlock bool `protobuf:"varint,2,opt,name=failing_checks_block,json=failingChecksBlock,proto3" json:"failing_checks_block,omitempty"`
	347	+	AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.storage.MergeMode" json:"allowed_merge_modes,omitempty"`
	348	+	// Unused: never read, never written.
	349	+	//
	350	+	// Deprecated: Marked as deprecated in ermite/storage/merge_request.proto.
	351	+	FailingChecksBlock bool `protobuf:"varint,2,opt,name=failing_checks_block,json=failingChecksBlock,proto3" json:"failing_checks_block,omitempty"`
349	352		// Who may write issues; unspecified reads as off.
350	353		Issues IssuesMode `protobuf:"varint,3,opt,name=issues,proto3,enum=ermite.storage.IssuesMode" json:"issues,omitempty"`
351	354		// Set on every write since merge commits exist: the modes are the explicit

@@ -395,6 +398,7 @@ func (x *RepoSettings) GetAllowedMergeModes() []MergeMode {
395	398		return nil
396	399		}
397	400
	401	+	// Deprecated: Marked as deprecated in ermite/storage/merge_request.proto.
398	402		func (x *RepoSettings) GetFailingChecksBlock() bool {
399	403		if x != nil {
400	404		return x.FailingChecksBlock

@@ -982,10 +986,10 @@ var File_ermite_storage_merge_request_proto protoreflect.FileDescriptor
982	986
983	987		const file_ermite_storage_merge_request_proto_rawDesc = "" +
984	988		"\n" +
985		-	"\"ermite/storage/merge_request.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\x8f\x02\n" +
	989	+	"\"ermite/storage/merge_request.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\x93\x02\n" +
986	990		"\fRepoSettings\x12I\n" +
987		-	"\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x19.ermite.storage.MergeModeR\x11allowedMergeModes\x120\n" +
988		-	"\x14failing_checks_block\x18\x02 \x01(\bR\x12failingChecksBlock\x122\n" +
	991	+	"\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x19.ermite.storage.MergeModeR\x11allowedMergeModes\x124\n" +
	992	+	"\x14failing_checks_block\x18\x02 \x01(\bB\x02\x18\x01R\x12failingChecksBlock\x122\n" +
989	993		"\x06issues\x18\x03 \x01(\x0e2\x1a.ermite.storage.IssuesModeR\x06issues\x12$\n" +
990	994		"\x0emerge_modes_v2\x18\x04 \x01(\bR\fmergeModesV2\x12(\n" +
991	995		"\x10allow_auto_merge\x18\x05 \x01(\bR\x0eallowAutoMerge\"\x81\x05\n" +

 type RepoSettings struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	// Never empty once stored.
-	AllowedMergeModes  []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.storage.MergeMode" json:"allowed_merge_modes,omitempty"`
+	AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.storage.MergeMode" json:"allowed_merge_modes,omitempty"`
-	FailingChecksBlock bool        `protobuf:"varint,2,opt,name=failing_checks_block,json=failingChecksBlock,proto3" json:"failing_checks_block,omitempty"`
+	// Unused: never read, never written.
+	//
+	// Deprecated: Marked as deprecated in ermite/storage/merge_request.proto.
+	FailingChecksBlock bool `protobuf:"varint,2,opt,name=failing_checks_block,json=failingChecksBlock,proto3" json:"failing_checks_block,omitempty"`
 	// Who may write issues; unspecified reads as off.
 	Issues IssuesMode `protobuf:"varint,3,opt,name=issues,proto3,enum=ermite.storage.IssuesMode" json:"issues,omitempty"`
 	// Set on every write since merge commits exist: the modes are the explicit
 	return nil
 }
+// Deprecated: Marked as deprecated in ermite/storage/merge_request.proto.
 func (x *RepoSettings) GetFailingChecksBlock() bool {
 	if x != nil {
 		return x.FailingChecksBlock
 const file_ermite_storage_merge_request_proto_rawDesc = "" +
 	"\n" +
-	"\"ermite/storage/merge_request.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\x8f\x02\n" +
+	"\"ermite/storage/merge_request.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\x93\x02\n" +
 	"\fRepoSettings\x12I\n" +
-	"\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x19.ermite.storage.MergeModeR\x11allowedMergeModes\x120\n" +
+	"\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x19.ermite.storage.MergeModeR\x11allowedMergeModes\x124\n" +
-	"\x14failing_checks_block\x18\x02 \x01(\bR\x12failingChecksBlock\x122\n" +
+	"\x14failing_checks_block\x18\x02 \x01(\bB\x02\x18\x01R\x12failingChecksBlock\x122\n" +
 	"\x06issues\x18\x03 \x01(\x0e2\x1a.ermite.storage.IssuesModeR\x06issues\x12$\n" +
 	"\x0emerge_modes_v2\x18\x04 \x01(\bR\fmergeModesV2\x12(\n" +
 	"\x10allow_auto_merge\x18\x05 \x01(\bR\x0eallowAutoMerge\"\x81\x05\n" +

M go.mod +1 -1


@@ -13,7 +13,7 @@ tool (
13	13
14	14		require (
15	15		bnema.dev/ermite-actions v0.2.0
16		-	bnema.dev/ermite-api v0.14.0
	16	+	bnema.dev/ermite-api v0.15.0
17	17		bnema.dev/ermite-git v0.1.0
18	18		bnema.dev/ermite-kv v0.1.0
19	19		connectrpc.com/connect v1.21.0


@@ -13,7 +13,7 @@ tool (
13			13
14		require (	14		require (
15		bnema.dev/ermite-actions v0.2.0	15		bnema.dev/ermite-actions v0.2.0
16	-	bnema.dev/ermite-api v0.14.0	16	+	bnema.dev/ermite-api v0.15.0
17		bnema.dev/ermite-git v0.1.0	17		bnema.dev/ermite-git v0.1.0
18		bnema.dev/ermite-kv v0.1.0	18		bnema.dev/ermite-kv v0.1.0
19		connectrpc.com/connect v1.21.0	19		connectrpc.com/connect v1.21.0

M go.sum +2 -2 generated file: collapsed

load diff

M internal/adapters/client/features.go +4 -0


@@ -8,6 +8,10 @@ import "slices"
8	8		// ServerService.GetVersion. A server without one still works for everything
9	9		// else: the CLI warns instead of failing.
10	10		const (
	11	+	// FeatureMarkReady permits marking draft merge requests ready.
	12	+	FeatureMarkReady = "merge_requests.ready"
	13	+	// FeatureIgnoreChecks permits merging with checks bypassed.
	14	+	FeatureIgnoreChecks = "merge_requests.ignore_checks"
11	15		// FeatureRepoUpdate is RepoService.UpdateRepo (`ermite repo edit`).
12	16		FeatureRepoUpdate = "repo.update"
13	17		// FeatureEventsResume is EventService.Watch with resume_after, which


@@ -8,6 +8,10 @@ import "slices"
8	// ServerService.GetVersion. A server without one still works for everything	8		// ServerService.GetVersion. A server without one still works for everything
9	// else: the CLI warns instead of failing.	9		// else: the CLI warns instead of failing.
10	const (	10		const (
		11	+	// FeatureMarkReady permits marking draft merge requests ready.
		12	+	FeatureMarkReady = "merge_requests.ready"
		13	+	// FeatureIgnoreChecks permits merging with checks bypassed.
		14	+	FeatureIgnoreChecks = "merge_requests.ignore_checks"
11	// FeatureRepoUpdate is RepoService.UpdateRepo (`ermite repo edit`).	15		// FeatureRepoUpdate is RepoService.UpdateRepo (`ermite repo edit`).
12	FeatureRepoUpdate = "repo.update"	16		FeatureRepoUpdate = "repo.update"
13	// FeatureEventsResume is EventService.Watch with resume_after, which	17		// FeatureEventsResume is EventService.Watch with resume_after, which

M internal/adapters/client/scopes.go +3 -0


@@ -28,6 +28,9 @@ var PresetNames = []string{presetCLI, presetAgent, presetCI, presetRunner}
28	28		// ScopeName is the name of a scope as users type it and as the docs write
29	29		// it: SCOPE_REPO_READ is "repo:read".
30	30		func ScopeName(s ermite.Scope) string {
	31	+	if s == ermite.Scope_SCOPE_MR_FORCE_MERGE {
	32	+	return "mr:force-merge"
	33	+	}
31	34		name, ok := ermite.Scope_name[int32(s)]
32	35		if !ok {
33	36		return strconv.Itoa(int(s))


@@ -28,6 +28,9 @@ var PresetNames = []string{presetCLI, presetAgent, presetCI, presetRunner}
28	// ScopeName is the name of a scope as users type it and as the docs write	28		// ScopeName is the name of a scope as users type it and as the docs write
29	// it: SCOPE_REPO_READ is "repo:read".	29		// it: SCOPE_REPO_READ is "repo:read".
30	func ScopeName(s ermite.Scope) string {	30		func ScopeName(s ermite.Scope) string {
		31	+	if s == ermite.Scope_SCOPE_MR_FORCE_MERGE {
		32	+	return "mr:force-merge"
		33	+	}
31	name, ok := ermite.Scope_name[int32(s)]	34		name, ok := ermite.Scope_name[int32(s)]
32	if !ok {	35		if !ok {
33	return strconv.Itoa(int(s))	36		return strconv.Itoa(int(s))

M internal/adapters/client/scopes_test.go +1 -0


@@ -16,6 +16,7 @@ import (
16	16
17	17		func TestScopeWireNames(t *testing.T) {
18	18		want := map[ermite.Scope]string{
	19	+	ermite.Scope_SCOPE_MR_FORCE_MERGE: "mr:force-merge",
19	20		ermite.Scope_SCOPE_MR_REVIEW: "mr:review",
20	21		ermite.Scope_SCOPE_REPO_READ: "repo:read",
21	22		ermite.Scope_SCOPE_REPO_WRITE: "repo:write",


@@ -16,6 +16,7 @@ import (
16		16
17	func TestScopeWireNames(t *testing.T) {	17		func TestScopeWireNames(t *testing.T) {
18	want := map[ermite.Scope]string{	18		want := map[ermite.Scope]string{
		19	+	ermite.Scope_SCOPE_MR_FORCE_MERGE: "mr:force-merge",
19	ermite.Scope_SCOPE_MR_REVIEW: "mr:review",	20		ermite.Scope_SCOPE_MR_REVIEW: "mr:review",
20	ermite.Scope_SCOPE_REPO_READ: "repo:read",	21		ermite.Scope_SCOPE_REPO_READ: "repo:read",
21	ermite.Scope_SCOPE_REPO_WRITE: "repo:write",	22		ermite.Scope_SCOPE_REPO_WRITE: "repo:write",

M internal/adapters/kvstore/issues_test.go +53 -6


@@ -271,7 +271,7 @@ func TestRepoSettingsKeepTheIssuesMode(t *testing.T) {
271	271
272	272		// TestSchema4UpgradesTheTokensWithAllScopes: the tokens that held every
273	273		// original scope keep their owner rights, gaining mr:review and issue:write
274		-	// (each only if missing); no other token changes.
	274	+	// (each only if missing), then mr:force-merge in schema 5; no other token changes.
275	275		func TestSchema4UpgradesTheTokensWithAllScopes(t *testing.T) {
276	276		ctx := context.Background()
277	277		dir := t.TempDir()

@@ -309,17 +309,20 @@ func TestSchema4UpgradesTheTokensWithAllScopes(t *testing.T) {
309	309		full := get("full")
310	310		assert.Contains(t, full.Scopes, domain.ScopeIssueWrite)
311	311		assert.Contains(t, full.Scopes, domain.ScopeMRReview)
312		-	assert.Len(t, full.Scopes, 11)
	312	+	assert.Len(t, full.Scopes, 12)
313	313		full10 := get("full10")
314		-	assert.Len(t, full10.Scopes, 11)
	314	+	assert.Len(t, full10.Scopes, 12)
315	315		assert.Equal(t, 1, countScope(full10.Scopes, domain.ScopeMRReview))
316	316		assert.Contains(t, full10.Scopes, domain.ScopeIssueWrite)
317	317		assert.True(t, domain.TokenPrincipal(full10).HasOwnerRights())
318	318		assert.Len(t, get("reposmr").Scopes, 10)
319	319		assert.NotContains(t, get("reposmr").Scopes, domain.ScopeIssueWrite)
320	320		assert.True(t, domain.TokenPrincipal(full).HasOwnerRights())
321		-	assert.True(t, domain.TokenPrincipal(get("otherfull")).HasOwnerRights(), "the order of the scopes does not matter")
	321	+	assert.True(t, domain.TokenPrincipal(get("otherfull")).HasOwnerRights())
322	322
	323	+	for _, id := range []string{"missing", "reposmr", "repos", "prefix", "small"} {
	324	+	assert.NotContains(t, get(id).Scopes, domain.ScopeMRForceMerge)
	325	+	}
323	326		assert.NotContains(t, get("missing").Scopes, domain.ScopeIssueWrite)
324	327		assert.NotContains(t, get("missing").Scopes, domain.ScopeMRReview)
325	328		assert.NotContains(t, get("repos").Scopes, domain.ScopeMRReview)

@@ -335,7 +338,7 @@ func TestSchema4UpgradesTheTokensWithAllScopes(t *testing.T) {
335	338		assert.Equal(t, "full", full.ID)
336	339
337	340		require.NoError(t, s.Close(ctx))
338		-	assert.Equal(t, uint32(4), readSchema(t, dir))
	341	+	assert.Equal(t, uint32(5), readSchema(t, dir))
339	342
340	343		// A second open changes nothing.
341	344		s2, err := kvstore.Open(ctx, dir)

@@ -355,7 +358,7 @@ func TestSchemaNewerThanThisBuildStopsIssuesData(t *testing.T) {
355	358		putRaw(t, dir, "meta/schema", mustProto(t, &storagepb.SchemaVersion{Version: kvstore.SchemaVersion + 1}))
356	359		_, err := kvstore.Open(ctx, dir)
357	360		require.ErrorIs(t, err, kvstore.ErrSchemaTooNew)
358		-	assert.Equal(t, uint32(4), uint32(kvstore.SchemaVersion))
	361	+	assert.Equal(t, uint32(5), uint32(kvstore.SchemaVersion))
359	362		}
360	363
361	364		// A reopen racing the delete of the repository either lands before the delete

@@ -561,3 +564,47 @@ func countScope(scopes []domain.Scope, want domain.Scope) int {
561	564		}
562	565		return n
563	566		}
	567	+
	568	+	func TestSchema5UpgradesOwnerEquivalentTokens(t *testing.T) {
	569	+	ctx := context.Background()
	570	+	dir := t.TempDir()
	571	+	putRaw(t, dir, "meta/schema", mustProto(t, &storagepb.SchemaVersion{Version: 4}))
	572	+	var previous []string
	573	+	for _, sc := range domain.AllScopes() {
	574	+	if sc != domain.ScopeMRForceMerge {
	575	+	previous = append(previous, sc.String())
	576	+	}
	577	+	}
	578	+	tokens := map[string]*storagepb.Token{
	579	+	"owner": {Id: "owner", Scopes: previous},
	580	+	"repos": {Id: "repos", Scopes: previous, Repos: []string{"proj"}},
	581	+	"branch": {Id: "branch", Scopes: previous, BranchPrefixes: []string{"agent/"}},
	582	+	"partial": {Id: "partial", Scopes: previous[:10]},
	583	+	}
	584	+	for id, tok := range tokens {
	585	+	tok.Hash = make([]byte, 32)
	586	+	putRaw(t, dir, "token/"+id, mustProto(t, tok))
	587	+	}
	588	+	for range 2 {
	589	+	s, err := kvstore.Open(ctx, dir)
	590	+	require.NoError(t, err)
	591	+	for id, original := range tokens {
	592	+	tok, err := s.Tokens().Get(ctx, id)
	593	+	require.NoError(t, err)
	594	+	if id == "owner" {
	595	+	assert.True(t, domain.TokenPrincipal(tok).HasOwnerRights())
	596	+	assert.Equal(t, 1, countScope(tok.Scopes, domain.ScopeMRForceMerge))
	597	+	assert.Len(t, tok.Scopes, 12)
	598	+	} else {
	599	+	assert.NotContains(t, tok.Scopes, domain.ScopeMRForceMerge)
	600	+	var got []string
	601	+	for _, sc := range tok.Scopes {
	602	+	got = append(got, sc.String())
	603	+	}
	604	+	assert.Equal(t, original.Scopes, got)
	605	+	}
	606	+	}
	607	+	require.NoError(t, s.Close(ctx))
	608	+	assert.Equal(t, uint32(5), readSchema(t, dir))
	609	+	}
	610	+	}


@@ -271,7 +271,7 @@ func TestRepoSettingsKeepTheIssuesMode(t *testing.T) {
271			271
272		// TestSchema4UpgradesTheTokensWithAllScopes: the tokens that held every	272		// TestSchema4UpgradesTheTokensWithAllScopes: the tokens that held every
273		// original scope keep their owner rights, gaining mr:review and issue:write	273		// original scope keep their owner rights, gaining mr:review and issue:write
274	-	// (each only if missing); no other token changes.	274	+	// (each only if missing), then mr:force-merge in schema 5; no other token changes.
275		func TestSchema4UpgradesTheTokensWithAllScopes(t *testing.T) {	275		func TestSchema4UpgradesTheTokensWithAllScopes(t *testing.T) {
276		ctx := context.Background()	276		ctx := context.Background()
277		dir := t.TempDir()	277		dir := t.TempDir()

@@ -309,17 +309,20 @@ func TestSchema4UpgradesTheTokensWithAllScopes(t *testing.T) {
309		full := get("full")	309		full := get("full")
310		assert.Contains(t, full.Scopes, domain.ScopeIssueWrite)	310		assert.Contains(t, full.Scopes, domain.ScopeIssueWrite)
311		assert.Contains(t, full.Scopes, domain.ScopeMRReview)	311		assert.Contains(t, full.Scopes, domain.ScopeMRReview)
312	-	assert.Len(t, full.Scopes, 11)	312	+	assert.Len(t, full.Scopes, 12)
313		full10 := get("full10")	313		full10 := get("full10")
314	-	assert.Len(t, full10.Scopes, 11)	314	+	assert.Len(t, full10.Scopes, 12)
315		assert.Equal(t, 1, countScope(full10.Scopes, domain.ScopeMRReview))	315		assert.Equal(t, 1, countScope(full10.Scopes, domain.ScopeMRReview))
316		assert.Contains(t, full10.Scopes, domain.ScopeIssueWrite)	316		assert.Contains(t, full10.Scopes, domain.ScopeIssueWrite)
317		assert.True(t, domain.TokenPrincipal(full10).HasOwnerRights())	317		assert.True(t, domain.TokenPrincipal(full10).HasOwnerRights())
318		assert.Len(t, get("reposmr").Scopes, 10)	318		assert.Len(t, get("reposmr").Scopes, 10)
319		assert.NotContains(t, get("reposmr").Scopes, domain.ScopeIssueWrite)	319		assert.NotContains(t, get("reposmr").Scopes, domain.ScopeIssueWrite)
320		assert.True(t, domain.TokenPrincipal(full).HasOwnerRights())	320		assert.True(t, domain.TokenPrincipal(full).HasOwnerRights())
321	-	assert.True(t, domain.TokenPrincipal(get("otherfull")).HasOwnerRights(), "the order of the scopes does not matter")	321	+	assert.True(t, domain.TokenPrincipal(get("otherfull")).HasOwnerRights())
322			322
			323	+	for _, id := range []string{"missing", "reposmr", "repos", "prefix", "small"} {
			324	+	assert.NotContains(t, get(id).Scopes, domain.ScopeMRForceMerge)
			325	+	}
323		assert.NotContains(t, get("missing").Scopes, domain.ScopeIssueWrite)	326		assert.NotContains(t, get("missing").Scopes, domain.ScopeIssueWrite)
324		assert.NotContains(t, get("missing").Scopes, domain.ScopeMRReview)	327		assert.NotContains(t, get("missing").Scopes, domain.ScopeMRReview)
325		assert.NotContains(t, get("repos").Scopes, domain.ScopeMRReview)	328		assert.NotContains(t, get("repos").Scopes, domain.ScopeMRReview)

@@ -335,7 +338,7 @@ func TestSchema4UpgradesTheTokensWithAllScopes(t *testing.T) {
335		assert.Equal(t, "full", full.ID)	338		assert.Equal(t, "full", full.ID)
336			339
337		require.NoError(t, s.Close(ctx))	340		require.NoError(t, s.Close(ctx))
338	-	assert.Equal(t, uint32(4), readSchema(t, dir))	341	+	assert.Equal(t, uint32(5), readSchema(t, dir))
339			342
340		// A second open changes nothing.	343		// A second open changes nothing.
341		s2, err := kvstore.Open(ctx, dir)	344		s2, err := kvstore.Open(ctx, dir)

@@ -355,7 +358,7 @@ func TestSchemaNewerThanThisBuildStopsIssuesData(t *testing.T) {
355		putRaw(t, dir, "meta/schema", mustProto(t, &storagepb.SchemaVersion{Version: kvstore.SchemaVersion + 1}))	358		putRaw(t, dir, "meta/schema", mustProto(t, &storagepb.SchemaVersion{Version: kvstore.SchemaVersion + 1}))
356		_, err := kvstore.Open(ctx, dir)	359		_, err := kvstore.Open(ctx, dir)
357		require.ErrorIs(t, err, kvstore.ErrSchemaTooNew)	360		require.ErrorIs(t, err, kvstore.ErrSchemaTooNew)
358	-	assert.Equal(t, uint32(4), uint32(kvstore.SchemaVersion))	361	+	assert.Equal(t, uint32(5), uint32(kvstore.SchemaVersion))
359		}	362		}
360			363
361		// A reopen racing the delete of the repository either lands before the delete	364		// A reopen racing the delete of the repository either lands before the delete

@@ -561,3 +564,47 @@ func countScope(scopes []domain.Scope, want domain.Scope) int {
561		}	564		}
562		return n	565		return n
563		}	566		}
			567	+
			568	+	func TestSchema5UpgradesOwnerEquivalentTokens(t *testing.T) {
			569	+	ctx := context.Background()
			570	+	dir := t.TempDir()
			571	+	putRaw(t, dir, "meta/schema", mustProto(t, &storagepb.SchemaVersion{Version: 4}))
			572	+	var previous []string
			573	+	for _, sc := range domain.AllScopes() {
			574	+	if sc != domain.ScopeMRForceMerge {
			575	+	previous = append(previous, sc.String())
			576	+	}
			577	+	}
			578	+	tokens := map[string]*storagepb.Token{
			579	+	"owner": {Id: "owner", Scopes: previous},
			580	+	"repos": {Id: "repos", Scopes: previous, Repos: []string{"proj"}},
			581	+	"branch": {Id: "branch", Scopes: previous, BranchPrefixes: []string{"agent/"}},
			582	+	"partial": {Id: "partial", Scopes: previous[:10]},
			583	+	}
			584	+	for id, tok := range tokens {
			585	+	tok.Hash = make([]byte, 32)
			586	+	putRaw(t, dir, "token/"+id, mustProto(t, tok))
			587	+	}
			588	+	for range 2 {
			589	+	s, err := kvstore.Open(ctx, dir)
			590	+	require.NoError(t, err)
			591	+	for id, original := range tokens {
			592	+	tok, err := s.Tokens().Get(ctx, id)
			593	+	require.NoError(t, err)
			594	+	if id == "owner" {
			595	+	assert.True(t, domain.TokenPrincipal(tok).HasOwnerRights())
			596	+	assert.Equal(t, 1, countScope(tok.Scopes, domain.ScopeMRForceMerge))
			597	+	assert.Len(t, tok.Scopes, 12)
			598	+	} else {
			599	+	assert.NotContains(t, tok.Scopes, domain.ScopeMRForceMerge)
			600	+	var got []string
			601	+	for _, sc := range tok.Scopes {
			602	+	got = append(got, sc.String())
			603	+	}
			604	+	assert.Equal(t, original.Scopes, got)
			605	+	}
			606	+	}
			607	+	require.NoError(t, s.Close(ctx))
			608	+	assert.Equal(t, uint32(5), readSchema(t, dir))
			609	+	}
			610	+	}

M internal/adapters/kvstore/mergerequests.go +2 -2


@@ -939,7 +939,7 @@ func decodeSide(s storagepb.DiffSide) domain.DiffSide {
939	939		}
940	940
941	941		func encodeSettings(s domain.RepoSettings) (*storagepb.RepoSettings, error) {
942		-	pb := &storagepb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, MergeModesV2: true, AllowAutoMerge: s.AllowAutoMerge}
	942	+	pb := &storagepb.RepoSettings{MergeModesV2: true, AllowAutoMerge: s.AllowAutoMerge}
943	943		for _, m := range s.AllowedMergeModes {
944	944		mode, err := encodeMode(m)
945	945		if err != nil \|\| mode == storagepb.MergeMode_MERGE_MODE_UNSPECIFIED {

@@ -979,5 +979,5 @@ func decodeSettings(pb *storagepb.RepoSettings) domain.RepoSettings {
979	979		if !pb.GetMergeModesV2() && slices.Equal(normalized, []domain.MergeMode{domain.MergeModeFastForward, domain.MergeModeSquash}) {
980	980		normalized = domain.MergeModes()
981	981		}
982		-	return domain.RepoSettings{AllowedMergeModes: normalized, FailingChecksBlock: pb.GetFailingChecksBlock(), Issues: decodeIssuesMode(pb.GetIssues()), AllowAutoMerge: pb.GetAllowAutoMerge()}
	982	+	return domain.RepoSettings{AllowedMergeModes: normalized, Issues: decodeIssuesMode(pb.GetIssues()), AllowAutoMerge: pb.GetAllowAutoMerge()}
983	983		}


@@ -939,7 +939,7 @@ func decodeSide(s storagepb.DiffSide) domain.DiffSide {
939		}	939		}
940			940
941		func encodeSettings(s domain.RepoSettings) (*storagepb.RepoSettings, error) {	941		func encodeSettings(s domain.RepoSettings) (*storagepb.RepoSettings, error) {
942	-	pb := &storagepb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, MergeModesV2: true, AllowAutoMerge: s.AllowAutoMerge}	942	+	pb := &storagepb.RepoSettings{MergeModesV2: true, AllowAutoMerge: s.AllowAutoMerge}
943		for _, m := range s.AllowedMergeModes {	943		for _, m := range s.AllowedMergeModes {
944		mode, err := encodeMode(m)	944		mode, err := encodeMode(m)
945		if err != nil \|\| mode == storagepb.MergeMode_MERGE_MODE_UNSPECIFIED {	945		if err != nil \|\| mode == storagepb.MergeMode_MERGE_MODE_UNSPECIFIED {

@@ -979,5 +979,5 @@ func decodeSettings(pb *storagepb.RepoSettings) domain.RepoSettings {
979		if !pb.GetMergeModesV2() && slices.Equal(normalized, []domain.MergeMode{domain.MergeModeFastForward, domain.MergeModeSquash}) {	979		if !pb.GetMergeModesV2() && slices.Equal(normalized, []domain.MergeMode{domain.MergeModeFastForward, domain.MergeModeSquash}) {
980		normalized = domain.MergeModes()	980		normalized = domain.MergeModes()
981		}	981		}
982	-	return domain.RepoSettings{AllowedMergeModes: normalized, FailingChecksBlock: pb.GetFailingChecksBlock(), Issues: decodeIssuesMode(pb.GetIssues()), AllowAutoMerge: pb.GetAllowAutoMerge()}	982	+	return domain.RepoSettings{AllowedMergeModes: normalized, Issues: decodeIssuesMode(pb.GetIssues()), AllowAutoMerge: pb.GetAllowAutoMerge()}
983		}	983		}

M internal/adapters/kvstore/mergerequests_test.go +2 -2


@@ -470,7 +470,7 @@ func TestRepoSettings(t *testing.T) {
470	470		require.NoError(t, err)
471	471		assert.Equal(t, domain.DefaultRepoSettings(), got.Settings)
472	472
473		-	got.Settings = domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}, FailingChecksBlock: false, Issues: domain.IssuesOwner}
	473	+	got.Settings = domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}, Issues: domain.IssuesOwner}
474	474		_, err = s.Mutate(ctx, n, func(r *domain.Repo) (bool, error) { r.Settings = got.Settings; return true, nil })
475	475		require.NoError(t, err)
476	476		again, err := s.Get(ctx, n)

@@ -634,7 +634,7 @@ func TestStoredOldDefaultModesGainMerge(t *testing.T) {
634	634
635	635		put := func(db *kv.DB, repo string, modes ...storagepb.MergeMode) {
636	636		val, err := proto.Marshal(&storagepb.Repo{Name: repo, Visibility: storagepb.Visibility_VISIBILITY_PUBLIC,
637		-	Settings: &storagepb.RepoSettings{AllowedMergeModes: modes, FailingChecksBlock: true}})
	637	+	Settings: &storagepb.RepoSettings{AllowedMergeModes: modes}})
638	638		require.NoError(t, err)
639	639		var b kv.Batch
640	640		b.Put([]byte("repo/"+repo), val)


@@ -470,7 +470,7 @@ func TestRepoSettings(t *testing.T) {
470		require.NoError(t, err)	470		require.NoError(t, err)
471		assert.Equal(t, domain.DefaultRepoSettings(), got.Settings)	471		assert.Equal(t, domain.DefaultRepoSettings(), got.Settings)
472			472
473	-	got.Settings = domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}, FailingChecksBlock: false, Issues: domain.IssuesOwner}	473	+	got.Settings = domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}, Issues: domain.IssuesOwner}
474		_, err = s.Mutate(ctx, n, func(r *domain.Repo) (bool, error) { r.Settings = got.Settings; return true, nil })	474		_, err = s.Mutate(ctx, n, func(r *domain.Repo) (bool, error) { r.Settings = got.Settings; return true, nil })
475		require.NoError(t, err)	475		require.NoError(t, err)
476		again, err := s.Get(ctx, n)	476		again, err := s.Get(ctx, n)

@@ -634,7 +634,7 @@ func TestStoredOldDefaultModesGainMerge(t *testing.T) {
634			634
635		put := func(db *kv.DB, repo string, modes ...storagepb.MergeMode) {	635		put := func(db *kv.DB, repo string, modes ...storagepb.MergeMode) {
636		val, err := proto.Marshal(&storagepb.Repo{Name: repo, Visibility: storagepb.Visibility_VISIBILITY_PUBLIC,	636		val, err := proto.Marshal(&storagepb.Repo{Name: repo, Visibility: storagepb.Visibility_VISIBILITY_PUBLIC,
637	-	Settings: &storagepb.RepoSettings{AllowedMergeModes: modes, FailingChecksBlock: true}})	637	+	Settings: &storagepb.RepoSettings{AllowedMergeModes: modes}})
638		require.NoError(t, err)	638		require.NoError(t, err)
639		var b kv.Batch	639		var b kv.Batch
640		b.Put([]byte("repo/"+repo), val)	640		b.Put([]byte("repo/"+repo), val)

M internal/adapters/kvstore/store.go +36 -8


@@ -39,8 +39,9 @@ import (
39	39		// (meta/issuekey). The upgrade also adds mr:review and issue:write (each only
40	40		// if missing) to the stored tokens that held all nine original scopes with no
41	41		// repository list and no branch prefix, so that they keep the owner rights (see
42		-	// upgradeTokens).
43		-	const SchemaVersion = 4
	42	+	// upgradeTokens). Version 5 grants mr:force-merge to unrestricted tokens
	43	+	// holding all eleven previous scopes, preserving their owner rights.
	44	+	const SchemaVersion = 5
44	45
45	46		const schemaKey = "meta/schema"
46	47

@@ -109,7 +110,7 @@ func (s *Store) Check(ctx context.Context) error {
109	110		func (s *Store) checkSchema(ctx context.Context) error {
110	111		log := zerowrap.FromCtx(ctx)
111	112		key := []byte(schemaKey)
112		-	for range 2 {
	113	+	for range 4 {
113	114		item, ok := s.db.Get(ctx, key)
114	115		if !ok {
115	116		var b kv.Batch

@@ -140,6 +141,10 @@ func (s *Store) checkSchema(ctx context.Context) error {
140	141		// the new version is recorded so that older builds refuse it.
141	142		// The tokens are upgraded in the same batch, so that a crash
142	143		// leaves the old version and the upgrade runs again.
	144	+	target := uint32(SchemaVersion)
	145	+	if sv.GetVersion() < 4 {
	146	+	target = 4
	147	+	}
143	148		var b kv.Batch
144	149		b.RequireVersion(key, item.Version)
145	150		if sv.GetVersion() < 4 {

@@ -147,7 +152,12 @@ func (s *Store) checkSchema(ctx context.Context) error {
147	152		return err
148	153		}
149	154		}
150		-	b.Put(key, mustMarshal(&storagepb.SchemaVersion{Version: SchemaVersion}))
	155	+	if sv.GetVersion() == 4 {
	156	+	if err := s.upgradeForceMergeTokens(ctx, &b); err != nil {
	157	+	return err
	158	+	}
	159	+	}
	160	+	b.Put(key, mustMarshal(&storagepb.SchemaVersion{Version: target}))
151	161		_, err := s.db.Apply(ctx, &b)
152	162		if errors.Is(err, kv.ErrConflict) {
153	163		continue // changed meanwhile: read it again

@@ -155,7 +165,10 @@ func (s *Store) checkSchema(ctx context.Context) error {
155	165		if err != nil {
156	166		return fmt.Errorf("upgrade storage schema: %w", err)
157	167		}
158		-	log.Info().Uint32("from", sv.GetVersion()).Uint32("schema", SchemaVersion).Msg("storage schema upgraded")
	168	+	log.Info().Uint32("from", sv.GetVersion()).Uint32("schema", target).Msg("storage schema upgraded")
	169	+	if target < SchemaVersion {
	170	+	continue
	171	+	}
159	172		return nil
160	173		}
161	174		log.Info().Uint32("schema", sv.GetVersion()).Msg("storage schema checked")

@@ -182,11 +195,26 @@ var preIssueScopes = []domain.Scope{
182	195
183	196		// upgradeTokens adds to b the schema 4 upgrade of the tokens: a token that
184	197		// holds all of preIssueScopes, limited to no repository and no branch prefix,
185		-	// had the owner rights, which AllScopes now needs mr:review and issue:write
	198	+	// had the owner rights, which schema 4 needed mr:review and issue:write
186	199		// for, so it gets each of them if missing (this is no escalation). Every other
187	200		// token is left as it is. The batch requires each token to be at the version it
188	201		// was read at.
189	202		func (s Store) upgradeTokens(ctx context.Context, b kv.Batch) error {
	203	+	return s.upgradeTokenScopes(ctx, b, preIssueScopes, []domain.Scope{domain.ScopeMRReview, domain.ScopeIssueWrite})
	204	+	}
	205	+
	206	+	// preForceMergeScopes are the eleven scopes of schema 4, before mr:force-merge.
	207	+	var preForceMergeScopes = append(slices.Clone(preIssueScopes), domain.ScopeMRReview, domain.ScopeIssueWrite)
	208	+
	209	+	// upgradeForceMergeTokens adds to b the schema 5 upgrade of the tokens: a
	210	+	// token that holds all of preForceMergeScopes, limited to no repository and no
	211	+	// branch prefix, had the owner rights, which AllScopes also needs
	212	+	// mr:force-merge for, so it gets it. Every other token is left as it is.
	213	+	func (s Store) upgradeForceMergeTokens(ctx context.Context, b kv.Batch) error {
	214	+	return s.upgradeTokenScopes(ctx, b, preForceMergeScopes, []domain.Scope{domain.ScopeMRForceMerge})
	215	+	}
	216	+
	217	+	func (s Store) upgradeTokenScopes(ctx context.Context, b kv.Batch, required, addedScopes []domain.Scope) error {
190	218		for key, item := range s.db.Snapshot(ctx).Prefix(ctx, []byte(tokenPrefix)) {
191	219		pb := &storagepb.Token{}
192	220		if err := proto.Unmarshal(item.Value, pb); err != nil {

@@ -196,7 +224,7 @@ func (s Store) upgradeTokens(ctx context.Context, b kv.Batch) error {
196	224		continue
197	225		}
198	226		full := true
199		-	for _, sc := range preIssueScopes {
	227	+	for _, sc := range required {
200	228		if !slices.Contains(pb.GetScopes(), sc.String()) {
201	229		full = false
202	230		break

@@ -206,7 +234,7 @@ func (s Store) upgradeTokens(ctx context.Context, b kv.Batch) error {
206	234		continue
207	235		}
208	236		added := false
209		-	for _, sc := range []domain.Scope{domain.ScopeMRReview, domain.ScopeIssueWrite} {
	237	+	for _, sc := range addedScopes {
210	238		if !slices.Contains(pb.GetScopes(), sc.String()) {
211	239		pb.Scopes = append(pb.Scopes, sc.String())
212	240		added = true

 // (meta/issuekey). The upgrade also adds mr:review and issue:write (each only
 // if missing) to the stored tokens that held all nine original scopes with no
 // repository list and no branch prefix, so that they keep the owner rights (see
-// upgradeTokens).
+// upgradeTokens). Version 5 grants mr:force-merge to unrestricted tokens
-const SchemaVersion = 4
+// holding all eleven previous scopes, preserving their owner rights.
+const SchemaVersion = 5
 const schemaKey = "meta/schema"
 func (s *Store) checkSchema(ctx context.Context) error {
 	log := zerowrap.FromCtx(ctx)
 	key := []byte(schemaKey)
-	for range 2 {
+	for range 4 {
 		item, ok := s.db.Get(ctx, key)
 		if !ok {
 			var b kv.Batch
 			// the new version is recorded so that older builds refuse it.
 			// The tokens are upgraded in the same batch, so that a crash
 			// leaves the old version and the upgrade runs again.
+			target := uint32(SchemaVersion)
+			if sv.GetVersion() < 4 {
+				target = 4
+			}
 			var b kv.Batch
 			b.RequireVersion(key, item.Version)
 			if sv.GetVersion() < 4 {
 					return err
 				}
 			}
-			b.Put(key, mustMarshal(&storagepb.SchemaVersion{Version: SchemaVersion}))
+			if sv.GetVersion() == 4 {
+				if err := s.upgradeForceMergeTokens(ctx, &b); err != nil {
+					return err
+				}
+			}
+			b.Put(key, mustMarshal(&storagepb.SchemaVersion{Version: target}))
 			_, err := s.db.Apply(ctx, &b)
 			if errors.Is(err, kv.ErrConflict) {
 				continue // changed meanwhile: read it again
 			if err != nil {
 				return fmt.Errorf("upgrade storage schema: %w", err)
 			}
-			log.Info().Uint32("from", sv.GetVersion()).Uint32("schema", SchemaVersion).Msg("storage schema upgraded")
+			log.Info().Uint32("from", sv.GetVersion()).Uint32("schema", target).Msg("storage schema upgraded")
+			if target < SchemaVersion {
+				continue
+			}
 			return nil
 		}
 		log.Info().Uint32("schema", sv.GetVersion()).Msg("storage schema checked")
 // upgradeTokens adds to b the schema 4 upgrade of the tokens: a token that
 // holds all of preIssueScopes, limited to no repository and no branch prefix,
-// had the owner rights, which AllScopes now needs mr:review and issue:write
+// had the owner rights, which schema 4 needed mr:review and issue:write
 // for, so it gets each of them if missing (this is no escalation). Every other
 // token is left as it is. The batch requires each token to be at the version it
 // was read at.
 func (s *Store) upgradeTokens(ctx context.Context, b *kv.Batch) error {
+	return s.upgradeTokenScopes(ctx, b, preIssueScopes, []domain.Scope{domain.ScopeMRReview, domain.ScopeIssueWrite})
+}
+// preForceMergeScopes are the eleven scopes of schema 4, before mr:force-merge.
+var preForceMergeScopes = append(slices.Clone(preIssueScopes), domain.ScopeMRReview, domain.ScopeIssueWrite)
+// upgradeForceMergeTokens adds to b the schema 5 upgrade of the tokens: a
+// token that holds all of preForceMergeScopes, limited to no repository and no
+// branch prefix, had the owner rights, which AllScopes also needs
+// mr:force-merge for, so it gets it. Every other token is left as it is.
+func (s *Store) upgradeForceMergeTokens(ctx context.Context, b *kv.Batch) error {
+	return s.upgradeTokenScopes(ctx, b, preForceMergeScopes, []domain.Scope{domain.ScopeMRForceMerge})
+}
+func (s *Store) upgradeTokenScopes(ctx context.Context, b *kv.Batch, required, addedScopes []domain.Scope) error {
 	for key, item := range s.db.Snapshot(ctx).Prefix(ctx, []byte(tokenPrefix)) {
 		pb := &storagepb.Token{}
 		if err := proto.Unmarshal(item.Value, pb); err != nil {
 			continue
 		}
 		full := true
-		for _, sc := range preIssueScopes {
+		for _, sc := range required {
 			if !slices.Contains(pb.GetScopes(), sc.String()) {
 				full = false
 				break
 			continue
 		}
 		added := false
-		for _, sc := range []domain.Scope{domain.ScopeMRReview, domain.ScopeIssueWrite} {
+		for _, sc := range addedScopes {
 			if !slices.Contains(pb.GetScopes(), sc.String()) {
 				pb.Scopes = append(pb.Scopes, sc.String())
 				added = true

M internal/adapters/rpc/api.go +1 -1


@@ -35,7 +35,7 @@ const RunnerMaxRequestBytes = MaxRequestBytes + 64<<10
35	35		// always implements, as GetVersion lists them. FeaturePasskeys comes on top
36	36		// when Config.Passkeys is set, and FeatureCISecrets when the settings services
37	37		// are, and FeatureCommitSignatures when Config.TrustedKeys is set.
38		-	var Features = []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.cache", "ci.workflows", "merge_requests.auto_merge"}
	38	+	var Features = []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.cache", "ci.workflows", "merge_requests.auto_merge", "merge_requests.ignore_checks", "merge_requests.ready"}
39	39
40	40		// FeaturePasskeys is listed by GetVersion when passkeys are available.
41	41		// FeatureCIArtifacts (artifact.go) when the artifact services are served.


@@ -35,7 +35,7 @@ const RunnerMaxRequestBytes = MaxRequestBytes + 64<<10
35		// always implements, as GetVersion lists them. FeaturePasskeys comes on top	35		// always implements, as GetVersion lists them. FeaturePasskeys comes on top
36		// when Config.Passkeys is set, and FeatureCISecrets when the settings services	36		// when Config.Passkeys is set, and FeatureCISecrets when the settings services
37		// are, and FeatureCommitSignatures when Config.TrustedKeys is set.	37		// are, and FeatureCommitSignatures when Config.TrustedKeys is set.
38	-	var Features = []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.cache", "ci.workflows", "merge_requests.auto_merge"}	38	+	var Features = []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.cache", "ci.workflows", "merge_requests.auto_merge", "merge_requests.ignore_checks", "merge_requests.ready"}
39			39
40		// FeaturePasskeys is listed by GetVersion when passkeys are available.	40		// FeaturePasskeys is listed by GetVersion when passkeys are available.
41		// FeatureCIArtifacts (artifact.go) when the artifact services are served.	41		// FeatureCIArtifacts (artifact.go) when the artifact services are served.

M internal/adapters/rpc/convert.go +2 -1


@@ -72,7 +72,7 @@ func repoToPB(v ports.RepoView) *pb.Repo {
72	72		}
73	73
74	74		func settingsToPB(s domain.RepoSettings) *pb.RepoSettings {
75		-	out := &pb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, AllowAutoMerge: s.AllowAutoMerge, Issues: issuesModeToPB(s.Issues)}
	75	+	out := &pb.RepoSettings{AllowAutoMerge: s.AllowAutoMerge, Issues: issuesModeToPB(s.Issues)}
76	76		for _, m := range s.AllowedMergeModes {
77	77		out.AllowedMergeModes = append(out.AllowedMergeModes, mergeModeToPB(m))
78	78		}

@@ -131,6 +131,7 @@ var scopeToPB = map[domain.Scope]pb.Scope{
131	131		domain.ScopeRepoAdmin: pb.Scope_SCOPE_REPO_ADMIN,
132	132		domain.ScopeMRWrite: pb.Scope_SCOPE_MR_WRITE,
133	133		domain.ScopeMRMerge: pb.Scope_SCOPE_MR_MERGE,
	134	+	domain.ScopeMRForceMerge: pb.Scope_SCOPE_MR_FORCE_MERGE,
134	135		domain.ScopeCIWrite: pb.Scope_SCOPE_CI_WRITE,
135	136		domain.ScopeSecretsWrite: pb.Scope_SCOPE_SECRETS_WRITE,
136	137		domain.ScopeRunnerRegister: pb.Scope_SCOPE_RUNNER_REGISTER,

 }
 func settingsToPB(s domain.RepoSettings) *pb.RepoSettings {
-	out := &pb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, AllowAutoMerge: s.AllowAutoMerge, Issues: issuesModeToPB(s.Issues)}
+	out := &pb.RepoSettings{AllowAutoMerge: s.AllowAutoMerge, Issues: issuesModeToPB(s.Issues)}
 	for _, m := range s.AllowedMergeModes {
 		out.AllowedMergeModes = append(out.AllowedMergeModes, mergeModeToPB(m))
 	}
 	domain.ScopeRepoAdmin:      pb.Scope_SCOPE_REPO_ADMIN,
 	domain.ScopeMRWrite:        pb.Scope_SCOPE_MR_WRITE,
 	domain.ScopeMRMerge:        pb.Scope_SCOPE_MR_MERGE,
+	domain.ScopeMRForceMerge:   pb.Scope_SCOPE_MR_FORCE_MERGE,
 	domain.ScopeCIWrite:        pb.Scope_SCOPE_CI_WRITE,
 	domain.ScopeSecretsWrite:   pb.Scope_SCOPE_SECRETS_WRITE,
 	domain.ScopeRunnerRegister: pb.Scope_SCOPE_RUNNER_REGISTER,

M internal/adapters/rpc/convert_test.go +9 -9


@@ -214,12 +214,12 @@ func TestRepoToPBAlwaysHasSettings(t *testing.T) {
214	214		// A repository value without settings (never stored with them) reads as the defaults.
215	215		r := repoToPB(ports.RepoView{Repo: domain.Repo{Name: mustName(t, "x")}})
216	216		assert.Equal(t, []pb.MergeMode{pb.MergeMode_MERGE_MODE_FAST_FORWARD, pb.MergeMode_MERGE_MODE_SQUASH, pb.MergeMode_MERGE_MODE_MERGE_COMMIT}, r.GetSettings().GetAllowedMergeModes())
217		-	assert.True(t, r.GetSettings().GetFailingChecksBlock())
	217	+	assert.False(t, r.GetSettings().GetAllowAutoMerge())
218	218
219	219		custom := domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}}
220	220		r = repoToPB(ports.RepoView{Repo: domain.Repo{Name: mustName(t, "x"), Settings: custom}})
221	221		assert.Equal(t, []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH}, r.GetSettings().GetAllowedMergeModes())
222		-	assert.False(t, r.GetSettings().GetFailingChecksBlock())
	222	+	assert.False(t, r.GetSettings().GetAllowAutoMerge())
223	223		}
224	224
225	225		func mustName(t *testing.T, s string) domain.RepoName {

@@ -235,8 +235,8 @@ func TestUpdateParamsSettingsPaths(t *testing.T) {
235	235		return &pb.UpdateRepoRequest{
236	236		UpdateMask: &fieldmaskpb.FieldMask{Paths: paths},
237	237		Settings: &pb.RepoSettings{
238		-	AllowedMergeModes: []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH},
239		-	FailingChecksBlock: true,
	238	+	AllowedMergeModes: []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH},
	239	+	AllowAutoMerge: true,
240	240		},
241	241		}
242	242		}

@@ -244,18 +244,18 @@ func TestUpdateParamsSettingsPaths(t *testing.T) {
244	244		require.NoError(t, err)
245	245		require.NotNil(t, p.AllowedMergeModes)
246	246		assert.Equal(t, []domain.MergeMode{domain.MergeModeSquash}, *p.AllowedMergeModes)
247		-	require.NotNil(t, p.FailingChecksBlock)
248		-	assert.True(t, *p.FailingChecksBlock)
	247	+	require.NotNil(t, p.AllowAutoMerge)
	248	+	assert.True(t, *p.AllowAutoMerge)
249	249
250	250		p, err = updateParams(msg("settings.allowed_merge_modes"))
251	251		require.NoError(t, err)
252	252		assert.NotNil(t, p.AllowedMergeModes)
253		-	assert.Nil(t, p.FailingChecksBlock, "not named: left alone")
	253	+	assert.Nil(t, p.AllowAutoMerge, "not named: left alone")
254	254
255		-	p, err = updateParams(msg("settings.failing_checks_block"))
	255	+	p, err = updateParams(msg("settings.allow_auto_merge"))
256	256		require.NoError(t, err)
257	257		assert.Nil(t, p.AllowedMergeModes)
258		-	assert.NotNil(t, p.FailingChecksBlock)
	258	+	assert.NotNil(t, p.AllowAutoMerge)
259	259
260	260		// Modes named with nothing to take them from are an empty list, which the use case refuses.
261	261		p, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"settings.allowed_merge_modes"}}})


@@ -214,12 +214,12 @@ func TestRepoToPBAlwaysHasSettings(t *testing.T) {
214		// A repository value without settings (never stored with them) reads as the defaults.	214		// A repository value without settings (never stored with them) reads as the defaults.
215		r := repoToPB(ports.RepoView{Repo: domain.Repo{Name: mustName(t, "x")}})	215		r := repoToPB(ports.RepoView{Repo: domain.Repo{Name: mustName(t, "x")}})
216		assert.Equal(t, []pb.MergeMode{pb.MergeMode_MERGE_MODE_FAST_FORWARD, pb.MergeMode_MERGE_MODE_SQUASH, pb.MergeMode_MERGE_MODE_MERGE_COMMIT}, r.GetSettings().GetAllowedMergeModes())	216		assert.Equal(t, []pb.MergeMode{pb.MergeMode_MERGE_MODE_FAST_FORWARD, pb.MergeMode_MERGE_MODE_SQUASH, pb.MergeMode_MERGE_MODE_MERGE_COMMIT}, r.GetSettings().GetAllowedMergeModes())
217	-	assert.True(t, r.GetSettings().GetFailingChecksBlock())	217	+	assert.False(t, r.GetSettings().GetAllowAutoMerge())
218			218
219		custom := domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}}	219		custom := domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}}
220		r = repoToPB(ports.RepoView{Repo: domain.Repo{Name: mustName(t, "x"), Settings: custom}})	220		r = repoToPB(ports.RepoView{Repo: domain.Repo{Name: mustName(t, "x"), Settings: custom}})
221		assert.Equal(t, []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH}, r.GetSettings().GetAllowedMergeModes())	221		assert.Equal(t, []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH}, r.GetSettings().GetAllowedMergeModes())
222	-	assert.False(t, r.GetSettings().GetFailingChecksBlock())	222	+	assert.False(t, r.GetSettings().GetAllowAutoMerge())
223		}	223		}
224			224
225		func mustName(t *testing.T, s string) domain.RepoName {	225		func mustName(t *testing.T, s string) domain.RepoName {

@@ -235,8 +235,8 @@ func TestUpdateParamsSettingsPaths(t *testing.T) {
235		return &pb.UpdateRepoRequest{	235		return &pb.UpdateRepoRequest{
236		UpdateMask: &fieldmaskpb.FieldMask{Paths: paths},	236		UpdateMask: &fieldmaskpb.FieldMask{Paths: paths},
237		Settings: &pb.RepoSettings{	237		Settings: &pb.RepoSettings{
238	-	AllowedMergeModes: []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH},	238	+	AllowedMergeModes: []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH},
239	-	FailingChecksBlock: true,	239	+	AllowAutoMerge: true,
240		},	240		},
241		}	241		}
242		}	242		}

@@ -244,18 +244,18 @@ func TestUpdateParamsSettingsPaths(t *testing.T) {
244		require.NoError(t, err)	244		require.NoError(t, err)
245		require.NotNil(t, p.AllowedMergeModes)	245		require.NotNil(t, p.AllowedMergeModes)
246		assert.Equal(t, []domain.MergeMode{domain.MergeModeSquash}, *p.AllowedMergeModes)	246		assert.Equal(t, []domain.MergeMode{domain.MergeModeSquash}, *p.AllowedMergeModes)
247	-	require.NotNil(t, p.FailingChecksBlock)	247	+	require.NotNil(t, p.AllowAutoMerge)
248	-	assert.True(t, *p.FailingChecksBlock)	248	+	assert.True(t, *p.AllowAutoMerge)
249			249
250		p, err = updateParams(msg("settings.allowed_merge_modes"))	250		p, err = updateParams(msg("settings.allowed_merge_modes"))
251		require.NoError(t, err)	251		require.NoError(t, err)
252		assert.NotNil(t, p.AllowedMergeModes)	252		assert.NotNil(t, p.AllowedMergeModes)
253	-	assert.Nil(t, p.FailingChecksBlock, "not named: left alone")	253	+	assert.Nil(t, p.AllowAutoMerge, "not named: left alone")
254			254
255	-	p, err = updateParams(msg("settings.failing_checks_block"))	255	+	p, err = updateParams(msg("settings.allow_auto_merge"))
256		require.NoError(t, err)	256		require.NoError(t, err)
257		assert.Nil(t, p.AllowedMergeModes)	257		assert.Nil(t, p.AllowedMergeModes)
258	-	assert.NotNil(t, p.FailingChecksBlock)	258	+	assert.NotNil(t, p.AllowAutoMerge)
259			259
260		// Modes named with nothing to take them from are an empty list, which the use case refuses.	260		// Modes named with nothing to take them from are an empty list, which the use case refuses.
261		p, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"settings.allowed_merge_modes"}}})	261		p, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"settings.allowed_merge_modes"}}})

M internal/adapters/rpc/mergerequest.go +13 -1


@@ -399,7 +399,7 @@ func (s mergeRequestService) MergeMergeRequest(ctx context.Context, req connec
399	399		return nil, connectError(ctx, err)
400	400		}
401	401		res, err := s.mrs.Merge(ctx, caller(ctx), name, req.Msg.GetNumber(), ports.MergeParams{
402		-	Mode: mode, HeadID: head, DeleteSource: req.Msg.GetDeleteSourceBranch(),
	402	+	Mode: mode, HeadID: head, DeleteSource: req.Msg.GetDeleteSourceBranch(), IgnoreChecks: req.Msg.GetIgnoreChecks(),
403	403		})
404	404		if err != nil {
405	405		return nil, connectError(ctx, err)

@@ -423,3 +423,15 @@ func (s mergeRequestService) MarkRead(ctx context.Context, req connect.Request
423	423		}
424	424		return connect.NewResponse(&pb.MarkReadResponse{}), nil
425	425		}
	426	+
	427	+	func (s mergeRequestService) MarkReady(ctx context.Context, req connect.Request[pb.MarkReadyRequest]) (*connect.Response[pb.MarkReadyResponse], error) {
	428	+	name, err := domain.ParseRepoName(req.Msg.GetRepo())
	429	+	if err != nil {
	430	+	return nil, connectError(ctx, err)
	431	+	}
	432	+	mr, err := s.mrs.MarkReady(ctx, caller(ctx), name, req.Msg.GetNumber())
	433	+	if err != nil {
	434	+	return nil, connectError(ctx, err)
	435	+	}
	436	+	return connect.NewResponse(&pb.MarkReadyResponse{MergeRequest: mergeRequestToPB(mr)}), nil
	437	+	}


@@ -399,7 +399,7 @@ func (s mergeRequestService) MergeMergeRequest(ctx context.Context, req connec
399		return nil, connectError(ctx, err)	399		return nil, connectError(ctx, err)
400		}	400		}
401		res, err := s.mrs.Merge(ctx, caller(ctx), name, req.Msg.GetNumber(), ports.MergeParams{	401		res, err := s.mrs.Merge(ctx, caller(ctx), name, req.Msg.GetNumber(), ports.MergeParams{
402	-	Mode: mode, HeadID: head, DeleteSource: req.Msg.GetDeleteSourceBranch(),	402	+	Mode: mode, HeadID: head, DeleteSource: req.Msg.GetDeleteSourceBranch(), IgnoreChecks: req.Msg.GetIgnoreChecks(),
403		})	403		})
404		if err != nil {	404		if err != nil {
405		return nil, connectError(ctx, err)	405		return nil, connectError(ctx, err)

@@ -423,3 +423,15 @@ func (s mergeRequestService) MarkRead(ctx context.Context, req connect.Request
423		}	423		}
424		return connect.NewResponse(&pb.MarkReadResponse{}), nil	424		return connect.NewResponse(&pb.MarkReadResponse{}), nil
425		}	425		}
			426	+
			427	+	func (s mergeRequestService) MarkReady(ctx context.Context, req connect.Request[pb.MarkReadyRequest]) (*connect.Response[pb.MarkReadyResponse], error) {
			428	+	name, err := domain.ParseRepoName(req.Msg.GetRepo())
			429	+	if err != nil {
			430	+	return nil, connectError(ctx, err)
			431	+	}
			432	+	mr, err := s.mrs.MarkReady(ctx, caller(ctx), name, req.Msg.GetNumber())
			433	+	if err != nil {
			434	+	return nil, connectError(ctx, err)
			435	+	}
			436	+	return connect.NewResponse(&pb.MarkReadyResponse{MergeRequest: mergeRequestToPB(mr)}), nil
			437	+	}

M internal/adapters/rpc/mergerequest_test.go +31 -1


@@ -140,6 +140,7 @@ func TestMergeRequestServiceMerge(t *testing.T) {
140	140		wantCall bool
141	141		}{
142	142		{name: "ok", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: head, DeleteSourceBranch: true}, wantCall: true},
	143	+	{name: "ignore checks", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: head, IgnoreChecks: true}, wantCall: true},
143	144		{name: "head is not a full id", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: "abc"}, wantCode: connect.CodeInvalidArgument},
144	145		{name: "invalid repo", req: &pb.MergeMergeRequestRequest{Repo: "../x", Number: 1}, wantCode: connect.CodeInvalidArgument},
145	146		{name: "head moved", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: head}, usecase: domain.ErrConflict, wantCode: connect.CodeAborted, wantCall: true},

@@ -152,7 +153,7 @@ func TestMergeRequestServiceMerge(t *testing.T) {
152	153		mrs := mocks.NewMergeRequestService(t)
153	154		if tt.wantCall {
154	155		mrs.EXPECT().Merge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1), mock.MatchedBy(func(p ports.MergeParams) bool {
155		-	return p.DeleteSource == tt.req.GetDeleteSourceBranch() && (tt.req.GetHeadId() == "") == p.HeadID.IsZero()
	156	+	return p.IgnoreChecks == tt.req.GetIgnoreChecks() && p.DeleteSource == tt.req.GetDeleteSourceBranch() && (tt.req.GetHeadId() == "") == p.HeadID.IsZero()
156	157		})).Return(ports.MergeResult{MergeRequest: domain.MergeRequest{Number: 1}, SourceDeleted: true}, tt.usecase).Once()
157	158		}
158	159		resp, err := (&mergeRequestService{mrs: mrs}).MergeMergeRequest(ownerCtx(), connect.NewRequest(tt.req))

@@ -226,3 +227,32 @@ func TestMergeRequestServiceGet(t *testing.T) {
226	227		})
227	228		}
228	229		}
	230	+
	231	+	func TestMergeRequestServiceMarkReady(t *testing.T) {
	232	+	t.Parallel()
	233	+	for _, tt := range []struct {
	234	+	name string
	235	+	err error
	236	+	code connect.Code
	237	+	}{
	238	+	{name: "success"},
	239	+	{name: "not a draft", err: domain.ErrPreconditionFailed, code: connect.CodeFailedPrecondition},
	240	+	{name: "closed", err: domain.ErrPreconditionFailed, code: connect.CodeFailedPrecondition},
	241	+	{name: "without mr:write", err: domain.ErrForbidden, code: connect.CodePermissionDenied},
	242	+	} {
	243	+	t.Run(tt.name, func(t *testing.T) {
	244	+	t.Parallel()
	245	+	mrs := mocks.NewMergeRequestService(t)
	246	+	title, err := domain.ParseMRTitle("Ready")
	247	+	require.NoError(t, err)
	248	+	mrs.EXPECT().MarkReady(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1)).Return(domain.MergeRequest{Number: 1, Title: title, State: domain.MRStateOpen}, tt.err).Once()
	249	+	res, err := (&mergeRequestService{mrs: mrs}).MarkReady(ownerCtx(), connect.NewRequest(&pb.MarkReadyRequest{Repo: "demo", Number: 1}))
	250	+	if tt.code != 0 {
	251	+	requireCode(t, tt.code, err)
	252	+	return
	253	+	}
	254	+	require.NoError(t, err)
	255	+	assert.Equal(t, "Ready", res.Msg.GetMergeRequest().GetTitle())
	256	+	})
	257	+	}
	258	+	}


@@ -140,6 +140,7 @@ func TestMergeRequestServiceMerge(t *testing.T) {
140		wantCall bool	140		wantCall bool
141		}{	141		}{
142		{name: "ok", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: head, DeleteSourceBranch: true}, wantCall: true},	142		{name: "ok", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: head, DeleteSourceBranch: true}, wantCall: true},
			143	+	{name: "ignore checks", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: head, IgnoreChecks: true}, wantCall: true},
143		{name: "head is not a full id", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: "abc"}, wantCode: connect.CodeInvalidArgument},	144		{name: "head is not a full id", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: "abc"}, wantCode: connect.CodeInvalidArgument},
144		{name: "invalid repo", req: &pb.MergeMergeRequestRequest{Repo: "../x", Number: 1}, wantCode: connect.CodeInvalidArgument},	145		{name: "invalid repo", req: &pb.MergeMergeRequestRequest{Repo: "../x", Number: 1}, wantCode: connect.CodeInvalidArgument},
145		{name: "head moved", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: head}, usecase: domain.ErrConflict, wantCode: connect.CodeAborted, wantCall: true},	146		{name: "head moved", req: &pb.MergeMergeRequestRequest{Repo: "demo", Number: 1, HeadId: head}, usecase: domain.ErrConflict, wantCode: connect.CodeAborted, wantCall: true},

@@ -152,7 +153,7 @@ func TestMergeRequestServiceMerge(t *testing.T) {
152		mrs := mocks.NewMergeRequestService(t)	153		mrs := mocks.NewMergeRequestService(t)
153		if tt.wantCall {	154		if tt.wantCall {
154		mrs.EXPECT().Merge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1), mock.MatchedBy(func(p ports.MergeParams) bool {	155		mrs.EXPECT().Merge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1), mock.MatchedBy(func(p ports.MergeParams) bool {
155	-	return p.DeleteSource == tt.req.GetDeleteSourceBranch() && (tt.req.GetHeadId() == "") == p.HeadID.IsZero()	156	+	return p.IgnoreChecks == tt.req.GetIgnoreChecks() && p.DeleteSource == tt.req.GetDeleteSourceBranch() && (tt.req.GetHeadId() == "") == p.HeadID.IsZero()
156		})).Return(ports.MergeResult{MergeRequest: domain.MergeRequest{Number: 1}, SourceDeleted: true}, tt.usecase).Once()	157		})).Return(ports.MergeResult{MergeRequest: domain.MergeRequest{Number: 1}, SourceDeleted: true}, tt.usecase).Once()
157		}	158		}
158		resp, err := (&mergeRequestService{mrs: mrs}).MergeMergeRequest(ownerCtx(), connect.NewRequest(tt.req))	159		resp, err := (&mergeRequestService{mrs: mrs}).MergeMergeRequest(ownerCtx(), connect.NewRequest(tt.req))

@@ -226,3 +227,32 @@ func TestMergeRequestServiceGet(t *testing.T) {
226		})	227		})
227		}	228		}
228		}	229		}
			230	+
			231	+	func TestMergeRequestServiceMarkReady(t *testing.T) {
			232	+	t.Parallel()
			233	+	for _, tt := range []struct {
			234	+	name string
			235	+	err error
			236	+	code connect.Code
			237	+	}{
			238	+	{name: "success"},
			239	+	{name: "not a draft", err: domain.ErrPreconditionFailed, code: connect.CodeFailedPrecondition},
			240	+	{name: "closed", err: domain.ErrPreconditionFailed, code: connect.CodeFailedPrecondition},
			241	+	{name: "without mr:write", err: domain.ErrForbidden, code: connect.CodePermissionDenied},
			242	+	} {
			243	+	t.Run(tt.name, func(t *testing.T) {
			244	+	t.Parallel()
			245	+	mrs := mocks.NewMergeRequestService(t)
			246	+	title, err := domain.ParseMRTitle("Ready")
			247	+	require.NoError(t, err)
			248	+	mrs.EXPECT().MarkReady(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1)).Return(domain.MergeRequest{Number: 1, Title: title, State: domain.MRStateOpen}, tt.err).Once()
			249	+	res, err := (&mergeRequestService{mrs: mrs}).MarkReady(ownerCtx(), connect.NewRequest(&pb.MarkReadyRequest{Repo: "demo", Number: 1}))
			250	+	if tt.code != 0 {
			251	+	requireCode(t, tt.code, err)
			252	+	return
			253	+	}
			254	+	require.NoError(t, err)
			255	+	assert.Equal(t, "Ready", res.Msg.GetMergeRequest().GetTitle())
			256	+	})
			257	+	}
			258	+	}

M internal/adapters/rpc/repo.go +2 -5


@@ -80,7 +80,7 @@ func (s repoService) UpdateRepo(ctx context.Context, req connect.Request[pb.Up
80	80
81	81		// updateParams maps the field mask of an update. The mask must name at least
82	82		// one of "description", "topics", "visibility", "default_branch", "settings",
83		-	// "settings.allowed_merge_modes", "settings.failing_checks_block" and
	83	+	// "settings.allowed_merge_modes" and
84	84		// "settings.allow_auto_merge", and nothing else; the optional issues field stands outside the mask, and alone
85	85		// it is a valid update.
86	86		func updateParams(msg *pb.UpdateRepoRequest) (ports.UpdateRepoParams, error) {

@@ -113,7 +113,7 @@ func updateParams(msg *pb.UpdateRepoRequest) (ports.UpdateRepoParams, error) {
113	113		params.Visibility = &vis
114	114		case "default_branch":
115	115		params.DefaultBranch = new(msg.GetDefaultBranch())
116		-	case "settings", "settings.allowed_merge_modes", "settings.failing_checks_block", "settings.allow_auto_merge":
	116	+	case "settings", "settings.allowed_merge_modes", "settings.allow_auto_merge":
117	117		all := path == "settings"
118	118		if all \|\| path == "settings.allowed_merge_modes" {
119	119		modes, err := mergeModesFromPB(msg.GetSettings().GetAllowedMergeModes())

@@ -122,9 +122,6 @@ func updateParams(msg *pb.UpdateRepoRequest) (ports.UpdateRepoParams, error) {
122	122		}
123	123		params.AllowedMergeModes = &modes
124	124		}
125		-	if all \|\| path == "settings.failing_checks_block" {
126		-	params.FailingChecksBlock = new(msg.GetSettings().GetFailingChecksBlock())
127		-	}
128	125		if all \|\| path == "settings.allow_auto_merge" {
129	126		params.AllowAutoMerge = new(msg.GetSettings().GetAllowAutoMerge())
130	127		}

 // updateParams maps the field mask of an update. The mask must name at least
 // one of "description", "topics", "visibility", "default_branch", "settings",
-// "settings.allowed_merge_modes", "settings.failing_checks_block" and
+// "settings.allowed_merge_modes" and
 // "settings.allow_auto_merge", and nothing else; the optional issues field stands outside the mask, and alone
 // it is a valid update.
 func updateParams(msg *pb.UpdateRepoRequest) (ports.UpdateRepoParams, error) {
 			params.Visibility = &vis
 		case "default_branch":
 			params.DefaultBranch = new(msg.GetDefaultBranch())
-		case "settings", "settings.allowed_merge_modes", "settings.failing_checks_block", "settings.allow_auto_merge":
+		case "settings", "settings.allowed_merge_modes", "settings.allow_auto_merge":
 			all := path == "settings"
 			if all || path == "settings.allowed_merge_modes" {
 				modes, err := mergeModesFromPB(msg.GetSettings().GetAllowedMergeModes())
 				}
 				params.AllowedMergeModes = &modes
 			}
-			if all || path == "settings.failing_checks_block" {
-				params.FailingChecksBlock = new(msg.GetSettings().GetFailingChecksBlock())
-			}
 			if all || path == "settings.allow_auto_merge" {
 				params.AllowAutoMerge = new(msg.GetSettings().GetAllowAutoMerge())
 			}

M internal/adapters/rpc/repo_test.go +1 -7


@@ -284,24 +284,18 @@ func TestRepoToPBTopics(t *testing.T) {
284	284		func TestUpdateParamsAllowAutoMerge(t *testing.T) {
285	285		t.Parallel()
286	286		mask := func(paths ...string) *fieldmaskpb.FieldMask { return &fieldmaskpb.FieldMask{Paths: paths} }
287		-	settings := &pb.RepoSettings{AllowAutoMerge: true, FailingChecksBlock: true, AllowedMergeModes: []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH}}
	287	+	settings := &pb.RepoSettings{AllowAutoMerge: true, AllowedMergeModes: []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH}}
288	288
289	289		params, err := updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings.allow_auto_merge"), Settings: settings})
290	290		require.NoError(t, err)
291	291		require.NotNil(t, params.AllowAutoMerge)
292	292		assert.True(t, *params.AllowAutoMerge)
293		-	assert.Nil(t, params.FailingChecksBlock, "only the masked setting is set")
294	293		assert.Nil(t, params.AllowedMergeModes)
295	294
296	295		params, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings"), Settings: settings})
297	296		require.NoError(t, err)
298	297		require.NotNil(t, params.AllowAutoMerge, "settings covers allow_auto_merge")
299	298		assert.True(t, *params.AllowAutoMerge)
300		-	require.NotNil(t, params.FailingChecksBlock)
301	299		require.NotNil(t, params.AllowedMergeModes)
302	300
303		-	params, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings.failing_checks_block"), Settings: settings})
304		-	require.NoError(t, err)
305		-	assert.Nil(t, params.AllowAutoMerge)
306		-	require.NotNil(t, params.FailingChecksBlock)
307	301		}

 func TestUpdateParamsAllowAutoMerge(t *testing.T) {
 	t.Parallel()
 	mask := func(paths ...string) *fieldmaskpb.FieldMask { return &fieldmaskpb.FieldMask{Paths: paths} }
-	settings := &pb.RepoSettings{AllowAutoMerge: true, FailingChecksBlock: true, AllowedMergeModes: []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH}}
+	settings := &pb.RepoSettings{AllowAutoMerge: true, AllowedMergeModes: []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH}}
 	params, err := updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings.allow_auto_merge"), Settings: settings})
 	require.NoError(t, err)
 	require.NotNil(t, params.AllowAutoMerge)
 	assert.True(t, *params.AllowAutoMerge)
-	assert.Nil(t, params.FailingChecksBlock, "only the masked setting is set")
 	assert.Nil(t, params.AllowedMergeModes)
 	params, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings"), Settings: settings})
 	require.NoError(t, err)
 	require.NotNil(t, params.AllowAutoMerge, "settings covers allow_auto_merge")
 	assert.True(t, *params.AllowAutoMerge)
-	require.NotNil(t, params.FailingChecksBlock)
 	require.NotNil(t, params.AllowedMergeModes)
-	params, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings.failing_checks_block"), Settings: settings})
-	require.NoError(t, err)
-	assert.Nil(t, params.AllowAutoMerge)
-	require.NotNil(t, params.FailingChecksBlock)
 }

M internal/adapters/web/checks.go +1 -3


@@ -111,10 +111,8 @@ func checksSection(repo domain.Repo, checks []ports.CheckView) ChecksSection {
111	111		switch {
112	112		case len(checks) == 0:
113	113		sec.Note = "no check on this commit: nothing blocks the merge."
114		-	case repo.Settings.FailingChecksBlock:
115		-	sec.Note = "a failing or unfinished check blocks the merge."
116	114		default:
117		-	sec.Note = "checks do not block the merge in this repository."
	115	+	sec.Note = "a failing or unfinished check blocks the merge."
118	116		}
119	117		return sec
120	118		}

 	switch {
 	case len(checks) == 0:
 		sec.Note = "no check on this commit: nothing blocks the merge."
-	case repo.Settings.FailingChecksBlock:
-		sec.Note = "a failing or unfinished check blocks the merge."
 	default:
-		sec.Note = "checks do not block the merge in this repository."
+		sec.Note = "a failing or unfinished check blocks the merge."
 	}
 	return sec
 }

M internal/adapters/web/fragments.go +18 -1


@@ -36,6 +36,8 @@ type liveStream struct {
36	36		// head shown (its checks are on that head); a job event does not carry
37	37		// its commit, so its run is read once. One stream reads it, no lock.
38	38		headRuns map[int64]bool
	39	+	// mergeChecksHTML is the last merge-form part sent, not sent again unchanged.
	40	+	mergeChecksHTML string
39	41		}
40	42
41	43		// maxHeadRuns bounds headRuns: past it the map starts again.

@@ -625,7 +627,22 @@ func (l *liveStream) mrChecks(ctx context.Context) ([]fragment, error) {
625	627		return nil, err
626	628		}
627	629		sum, err := renderFragment(ctx, "ci-run", MRChecksSum(checksSummary(name, l.head, checks)))
628		-	return []fragment{f, sum}, err
	630	+	if err != nil {
	631	+	return nil, err
	632	+	}
	633	+	// The merge form is the owner's: a visitor's stream never carries it.
	634	+	if !SignedIn(ctx) {
	635	+	return []fragment{f, sum}, nil
	636	+	}
	637	+	controls, err := renderFragment(ctx, "ci-run", MRMergeChecks(checksSummary(name, l.head, checks)))
	638	+	if err != nil {
	639	+	return nil, err
	640	+	}
	641	+	if controls.html == l.mergeChecksHTML {
	642	+	return []fragment{f, sum}, nil
	643	+	}
	644	+	l.mergeChecksHTML = controls.html
	645	+	return []fragment{f, sum, controls}, nil
629	646		}
630	647
631	648		// recentActions is the "Recent actions" block of the summary rail, read again


@@ -36,6 +36,8 @@ type liveStream struct {
36		// head shown (its checks are on that head); a job event does not carry	36		// head shown (its checks are on that head); a job event does not carry
37		// its commit, so its run is read once. One stream reads it, no lock.	37		// its commit, so its run is read once. One stream reads it, no lock.
38		headRuns map[int64]bool	38		headRuns map[int64]bool
			39	+	// mergeChecksHTML is the last merge-form part sent, not sent again unchanged.
			40	+	mergeChecksHTML string
39		}	41		}
40			42
41		// maxHeadRuns bounds headRuns: past it the map starts again.	43		// maxHeadRuns bounds headRuns: past it the map starts again.

@@ -625,7 +627,22 @@ func (l *liveStream) mrChecks(ctx context.Context) ([]fragment, error) {
625		return nil, err	627		return nil, err
626		}	628		}
627		sum, err := renderFragment(ctx, "ci-run", MRChecksSum(checksSummary(name, l.head, checks)))	629		sum, err := renderFragment(ctx, "ci-run", MRChecksSum(checksSummary(name, l.head, checks)))
628	-	return []fragment{f, sum}, err	630	+	if err != nil {
			631	+	return nil, err
			632	+	}
			633	+	// The merge form is the owner's: a visitor's stream never carries it.
			634	+	if !SignedIn(ctx) {
			635	+	return []fragment{f, sum}, nil
			636	+	}
			637	+	controls, err := renderFragment(ctx, "ci-run", MRMergeChecks(checksSummary(name, l.head, checks)))
			638	+	if err != nil {
			639	+	return nil, err
			640	+	}
			641	+	if controls.html == l.mergeChecksHTML {
			642	+	return []fragment{f, sum}, nil
			643	+	}
			644	+	l.mergeChecksHTML = controls.html
			645	+	return []fragment{f, sum, controls}, nil
629		}	646		}
630			647
631		// recentActions is the "Recent actions" block of the summary rail, read again	648		// recentActions is the "Recent actions" block of the summary rail, read again

M internal/adapters/web/mr.go +1 -1


@@ -740,7 +740,7 @@ func (s Server) mrFacts(ctx context.Context, r http.Request, d repoData, p M
740	740		p.Modes = append(p.Modes, name)
741	741		}
742	742		}
743		-	p.ChecksBlock = d.repo.Settings.FailingChecksBlock
	743	+	p.ChecksBlock = true
744	744		if head != "" {
745	745		checks := s.checksFor(ctx, d.repo.Name, head)
746	746		p.Checks = checksSection(d.repo.Repo, checks)


@@ -740,7 +740,7 @@ func (s Server) mrFacts(ctx context.Context, r http.Request, d repoData, p M
740		p.Modes = append(p.Modes, name)	740		p.Modes = append(p.Modes, name)
741		}	741		}
742		}	742		}
743	-	p.ChecksBlock = d.repo.Settings.FailingChecksBlock	743	+	p.ChecksBlock = true
744		if head != "" {	744		if head != "" {
745		checks := s.checksFor(ctx, d.repo.Name, head)	745		checks := s.checksFor(ctx, d.repo.Name, head)
746		p.Checks = checksSection(d.repo.Repo, checks)	746		p.Checks = checksSection(d.repo.Repo, checks)

M internal/adapters/web/mr.templ +13 -1


@@ -545,6 +545,7 @@ templ mergeMenu(p MRPage) {
545	545		</label>
546	546		}
547	547		</fieldset>
	548	+	@MRMergeChecks(p.ChecksSum)
548	549		if p.Box.CanDeleteBranch {
549	550		<label class="d-check"><input type="checkbox" name="delete_branch" value="1"/> delete { p.Source } after the merge <kbd aria-hidden="true">D</kbd></label>
550	551		}

@@ -634,7 +635,7 @@ templ moreMenu(p MRPage) {
634	635		<dt>checks</dt>
635	636		<dd>
636	637		if p.ChecksBlock {
637		-	failing ones block the merge
	638	+	failing or unfinished checks block the merge
638	639		} else {
639	640		do not block the merge
640	641		}

@@ -766,3 +767,14 @@ templ compareRail(p ComparePage) {
766	767		@CloneBlock(p.CLI)
767	768		</section>
768	769		}
	770	+
	771	+	// MRMergeChecks is the part of the owner's merge form that depends on the
	772	+	// checks: a live update replaces it and keeps "Ignore checks" ticked.
	773	+	templ MRMergeChecks(c ChecksSummary) {
	774	+	<div id="mr-merge-checks" data-keep-checks>
	775	+	if c.Kind == "bad" \|\| c.Kind == "running" {
	776	+	<p class="d-note">{ c.State + ": a failing or unfinished check blocks the merge." }</p>
	777	+	<label class="d-check"><input type="checkbox" name="ignore_checks"/> Ignore checks</label>
	778	+	}
	779	+	</div>
	780	+	}

 							</label>
 						}
 					</fieldset>
+					@MRMergeChecks(p.ChecksSum)
 					if p.Box.CanDeleteBranch {
 						<label class="d-check"><input type="checkbox" name="delete_branch" value="1"/> delete { p.Source } after the merge <kbd aria-hidden="true">D</kbd></label>
 					}
 					<dt>checks</dt>
 					<dd>
 						if p.ChecksBlock {
-							failing ones block the merge
+							failing or unfinished checks block the merge
 						} else {
 							do not block the merge
 						}
 		@CloneBlock(p.CLI)
 	</section>
 }
+// MRMergeChecks is the part of the owner's merge form that depends on the
+// checks: a live update replaces it and keeps "Ignore checks" ticked.
+templ MRMergeChecks(c ChecksSummary) {
+	<div id="mr-merge-checks" data-keep-checks>
+		if c.Kind == "bad" || c.Kind == "running" {
+			<p class="d-note">{ c.State + ": a failing or unfinished check blocks the merge." }</p>
+			<label class="d-check"><input type="checkbox" name="ignore_checks"/> Ignore checks</label>
+		}
+	</div>
+}

M internal/adapters/web/mr_post.go +1 -0


@@ -377,6 +377,7 @@ func (s Server) mrMerge(ctx context.Context, r http.Request) (string, string,
377	377		}
378	378		res, err := s.cfg.MergeRequests.Merge(ctx, principal(ctx), name, n, ports.MergeParams{
379	379		Mode: mode, HeadID: head, DeleteSource: r.PostFormValue("delete_branch") == "1",
	380	+	IgnoreChecks: r.PostFormValue("ignore_checks") == "on",
380	381		})
381	382		switch {
382	383		case errors.Is(err, domain.ErrPreconditionFailed), errors.Is(err, domain.ErrConflict):


@@ -377,6 +377,7 @@ func (s Server) mrMerge(ctx context.Context, r http.Request) (string, string,
377	}	377		}
378	res, err := s.cfg.MergeRequests.Merge(ctx, principal(ctx), name, n, ports.MergeParams{	378		res, err := s.cfg.MergeRequests.Merge(ctx, principal(ctx), name, n, ports.MergeParams{
379	Mode: mode, HeadID: head, DeleteSource: r.PostFormValue("delete_branch") == "1",	379		Mode: mode, HeadID: head, DeleteSource: r.PostFormValue("delete_branch") == "1",
		380	+	IgnoreChecks: r.PostFormValue("ignore_checks") == "on",
380	})	381		})
381	switch {	382		switch {
382	case errors.Is(err, domain.ErrPreconditionFailed), errors.Is(err, domain.ErrConflict):	383		case errors.Is(err, domain.ErrPreconditionFailed), errors.Is(err, domain.ErrConflict):

M internal/adapters/web/mr_templ.go +111 -53

show this file

M internal/adapters/web/mr_test.go +35 -1

show this file

M internal/adapters/web/static/js/ermite.js +7 -0

show this file

M internal/adapters/web/summary_actions_test.go +53 -0

show this file

M internal/app/api_test.go +1 -1

show this file

M internal/app/ci_e2e_test.go +3 -9

show this file

M internal/app/cli_e2e_test.go +2 -2

show this file

M internal/app/cli_issue_test.go +1 -1

show this file

M internal/app/cli_mr.go +45 -3

show this file

M internal/app/cli_mr_e2e_test.go +38 -14

show this file

M internal/app/cli_repo.go +17 -29

show this file

M internal/app/cli_repo_test.go +17 -27

show this file

M internal/app/cli_watch_test.go +1 -1

show this file

M internal/app/issue_api_test.go +0 -1

show this file

M internal/app/mr_api_test.go +9 -9

show this file

M internal/domain/ci.go +1 -1

show this file

M internal/domain/mergerequest.go +3 -5

show this file

M internal/domain/mergerequest_test.go +0 -1

show this file

M internal/domain/token.go +4 -2

show this file

M internal/domain/token_test.go +1 -1

show this file

M internal/ports/dto.go +2 -2

show this file

M internal/usecase/access.go +1 -1

show this file

M internal/usecase/automerge_test.go +1 -4

show this file

M internal/usecase/ci_unit_test.go +37 -6

show this file

M internal/usecase/mergerequests.go +12 -5

show this file

M internal/usecase/mergerequests_integration_test.go +5 -5

show this file

M internal/usecase/repos_write.go +4 -7

show this file

M internal/usecase/repos_write_test.go +1 -3

show this file

M proto/ermite/storage/merge_request.proto +2 -1

show this file

M skills/ermite/CLI.md +10 -4

show this file

M skills/ermite/SKILL.md +5 -3

show this file

Merge settings

Comments2 open / 2

Commit	Subject	Author	Date	Signature
f61e6a6	fix(store): keep failing_checks_block as a deprecated storage field, run the new subtests in parallel	brice	20h ago	GPG Verified
923f868	build(deps): use ermite-api v0.15.0	brice	21h ago	GPG Verified
eba8ed7	fix(scopes): keep the owner rights of full tokens with mr:force-merge, refresh the owner's merge check controls live	brice	23h ago	GPG Verified
7348bb2	feat(web): offer ignore checks on the merge form, document mr ready and the merge check rules	brice	23h ago	GPG Verified
5d0c190	feat(cli): add mr ready and mr merge --ignore-checks, implement the MarkReady RPC	brice	23h ago	GPG Verified
cfc292c	feat(merge): require passing checks to merge, add mr:force-merge and ignore_checks, drop failing_checks_block	brice	24h ago	GPG Verified