#3 feat(proto): merge request mergeability, its Watch event and the merge commit mode

M docs/services.md +2 -2


@@ -5,10 +5,10 @@
5	5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|
6	6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|
7	7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|
8		-	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest`, `MarkRead` \|
	8	+	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest` (modes fast-forward, squash, merge commit), `MarkRead`. Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` when it changes (feature `merge_requests.mergeability`) \|
9	9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|
10	10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|
11		-	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content) \|
	11	+	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content). Event 22: `merge_request_mergeability` \|
12	12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|
13	13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|
14	14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|


@@ -5,10 +5,10 @@
5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|	5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|
6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|	6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|
7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|	7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|
8	-	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest`, `MarkRead` \|	8	+	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest` (modes fast-forward, squash, merge commit), `MarkRead`. Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` when it changes (feature `merge_requests.mergeability`) \|
9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|	9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|
10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|	10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|
11	-	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content) \|	11	+	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content). Event 22: `merge_request_mergeability` \|
12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|	12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|
13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|	13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|
14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|	14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|

M gen/ermite/ermiteconnect/merge_request.connect.go +12 -6


@@ -127,9 +127,12 @@ type MergeRequestServiceClient interface {
127	127		// never merged unseen. Fails with invalid_argument if head_id is empty or
128	128		// not a commit id, and with failed_precondition if the merge request is not
129	129		// open, if the source branch no longer points to head_id ("branch moved,
130		-	// read again"), if the target is not an ancestor of the head (rebase and
131		-	// push again), if the mode is not allowed by RepoSettings, or if a check
132		-	// fails and RepoSettings.failing_checks_block is set. Merges of one
	130	+	// read again"), if the mode is fast-forward and the target is not an
	131	+	// ancestor of the head (rebase and push again, or merge with squash or
	132	+	// merge commit), if the mode is squash or merge commit and the head
	133	+	// conflicts with the target or shares no history with it (rebase and push
	134	+	// again), if the mode is not allowed by RepoSettings, or if a check fails
	135	+	// and RepoSettings.failing_checks_block is set. Merges of one
133	136		// repository run one at a time. Repeating a call that succeeded fails with
134	137		// failed_precondition (not open). On success the server publishes
135	138		// MergeRequestMerged then Pushed for the target branch.

@@ -339,9 +342,12 @@ type MergeRequestServiceHandler interface {
339	342		// never merged unseen. Fails with invalid_argument if head_id is empty or
340	343		// not a commit id, and with failed_precondition if the merge request is not
341	344		// open, if the source branch no longer points to head_id ("branch moved,
342		-	// read again"), if the target is not an ancestor of the head (rebase and
343		-	// push again), if the mode is not allowed by RepoSettings, or if a check
344		-	// fails and RepoSettings.failing_checks_block is set. Merges of one
	345	+	// read again"), if the mode is fast-forward and the target is not an
	346	+	// ancestor of the head (rebase and push again, or merge with squash or
	347	+	// merge commit), if the mode is squash or merge commit and the head
	348	+	// conflicts with the target or shares no history with it (rebase and push
	349	+	// again), if the mode is not allowed by RepoSettings, or if a check fails
	350	+	// and RepoSettings.failing_checks_block is set. Merges of one
345	351		// repository run one at a time. Repeating a call that succeeded fails with
346	352		// failed_precondition (not open). On success the server publishes
347	353		// MergeRequestMerged then Pushed for the target branch.

 	// never merged unseen. Fails with invalid_argument if head_id is empty or
 	// not a commit id, and with failed_precondition if the merge request is not
 	// open, if the source branch no longer points to head_id ("branch moved,
-	// read again"), if the target is not an ancestor of the head (rebase and
+	// read again"), if the mode is fast-forward and the target is not an
-	// push again), if the mode is not allowed by RepoSettings, or if a check
+	// ancestor of the head (rebase and push again, or merge with squash or
-	// fails and RepoSettings.failing_checks_block is set. Merges of one
+	// merge commit), if the mode is squash or merge commit and the head
+	// conflicts with the target or shares no history with it (rebase and push
+	// again), if the mode is not allowed by RepoSettings, or if a check fails
+	// and RepoSettings.failing_checks_block is set. Merges of one
 	// repository run one at a time. Repeating a call that succeeded fails with
 	// failed_precondition (not open). On success the server publishes
 	// MergeRequestMerged then Pushed for the target branch.
 	// never merged unseen. Fails with invalid_argument if head_id is empty or
 	// not a commit id, and with failed_precondition if the merge request is not
 	// open, if the source branch no longer points to head_id ("branch moved,
-	// read again"), if the target is not an ancestor of the head (rebase and
+	// read again"), if the mode is fast-forward and the target is not an
-	// push again), if the mode is not allowed by RepoSettings, or if a check
+	// ancestor of the head (rebase and push again, or merge with squash or
-	// fails and RepoSettings.failing_checks_block is set. Merges of one
+	// merge commit), if the mode is squash or merge commit and the head
+	// conflicts with the target or shares no history with it (rebase and push
+	// again), if the mode is not allowed by RepoSettings, or if a check fails
+	// and RepoSettings.failing_checks_block is set. Merges of one
 	// repository run one at a time. Repeating a call that succeeded fails with
 	// failed_precondition (not open). On success the server publishes
 	// MergeRequestMerged then Pushed for the target branch.

M gen/ermite/ermiteconnect/server.connect.go +2 -2


@@ -53,7 +53,7 @@ type ServerServiceClient interface {
53	53		// it first to check compatibility.
54	54		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)
55	55		// GetSigningKey returns the public key with which the server signs the
56		-	// commits it creates (squash merges, see MergeMode). It needs no
	56	+	// commits it creates (squash and merge commits, see MergeMode). It needs no
57	57		// authentication: the key is public, and anyone verifying a commit needs it.
58	58		// Servers that implement it list "signing_key" in
59	59		// GetVersionResponse.features.

@@ -132,7 +132,7 @@ type ServerServiceHandler interface {
132	132		// it first to check compatibility.
133	133		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)
134	134		// GetSigningKey returns the public key with which the server signs the
135		-	// commits it creates (squash merges, see MergeMode). It needs no
	135	+	// commits it creates (squash and merge commits, see MergeMode). It needs no
136	136		// authentication: the key is public, and anyone verifying a commit needs it.
137	137		// Servers that implement it list "signing_key" in
138	138		// GetVersionResponse.features.


@@ -53,7 +53,7 @@ type ServerServiceClient interface {
53		// it first to check compatibility.	53		// it first to check compatibility.
54		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)	54		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)
55		// GetSigningKey returns the public key with which the server signs the	55		// GetSigningKey returns the public key with which the server signs the
56	-	// commits it creates (squash merges, see MergeMode). It needs no	56	+	// commits it creates (squash and merge commits, see MergeMode). It needs no
57		// authentication: the key is public, and anyone verifying a commit needs it.	57		// authentication: the key is public, and anyone verifying a commit needs it.
58		// Servers that implement it list "signing_key" in	58		// Servers that implement it list "signing_key" in
59		// GetVersionResponse.features.	59		// GetVersionResponse.features.

@@ -132,7 +132,7 @@ type ServerServiceHandler interface {
132		// it first to check compatibility.	132		// it first to check compatibility.
133		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)	133		GetVersion(context.Context, connect.Request[ermite.GetVersionRequest]) (connect.Response[ermite.GetVersionResponse], error)
134		// GetSigningKey returns the public key with which the server signs the	134		// GetSigningKey returns the public key with which the server signs the
135	-	// commits it creates (squash merges, see MergeMode). It needs no	135	+	// commits it creates (squash and merge commits, see MergeMode). It needs no
136		// authentication: the key is public, and anyone verifying a commit needs it.	136		// authentication: the key is public, and anyone verifying a commit needs it.
137		// Servers that implement it list "signing_key" in	137		// Servers that implement it list "signing_key" in
138		// GetVersionResponse.features.	138		// GetVersionResponse.features.

M gen/ermite/event.pb.go +207 -112


@@ -170,6 +170,7 @@ type Event struct {
170	170		// *Event_IssueReopened
171	171		// *Event_IssueCommented
172	172		// *Event_IssueSubmitted
	173	+	// *Event_MergeRequestMergeability
173	174		Kind isEvent_Kind `protobuf_oneof:"kind"`
174	175		unknownFields protoimpl.UnknownFields
175	176		sizeCache protoimpl.SizeCache

@@ -397,6 +398,15 @@ func (x Event) GetIssueSubmitted() IssueSubmitted {
397	398		return nil
398	399		}
399	400
	401	+	func (x Event) GetMergeRequestMergeability() MergeRequestMergeability {
	402	+	if x != nil {
	403	+	if x, ok := x.Kind.(*Event_MergeRequestMergeability); ok {
	404	+	return x.MergeRequestMergeability
	405	+	}
	406	+	}
	407	+	return nil
	408	+	}
	409	+
400	410		type isEvent_Kind interface {
401	411		isEvent_Kind()
402	412		}

@@ -497,6 +507,12 @@ type Event_IssueSubmitted struct {
497	507		IssueSubmitted *IssueSubmitted `protobuf:"bytes,21,opt,name=issue_submitted,json=issueSubmitted,proto3,oneof"`
498	508		}
499	509
	510	+	type Event_MergeRequestMergeability struct {
	511	+	// MergeRequestMergeability: the mergeability of an open merge request
	512	+	// changed.
	513	+	MergeRequestMergeability *MergeRequestMergeability `protobuf:"bytes,22,opt,name=merge_request_mergeability,json=mergeRequestMergeability,proto3,oneof"`
	514	+	}
	515	+
500	516		func (*Event_RepoCreated) isEvent_Kind() {}
501	517
502	518		func (*Event_RepoUpdated) isEvent_Kind() {}

@@ -535,6 +551,8 @@ func (*Event_IssueCommented) isEvent_Kind() {}
535	551
536	552		func (*Event_IssueSubmitted) isEvent_Kind() {}
537	553
	554	+	func (*Event_MergeRequestMergeability) isEvent_Kind() {}
	555	+
538	556		// RepoCreated reports a new repository.
539	557		type RepoCreated struct {
540	558		state protoimpl.MessageState `protogen:"open.v1"`

@@ -885,6 +903,72 @@ func (x MergeRequestMerged) GetMergeRequest() MergeRequest {
885	903		return nil
886	904		}
887	905
	906	+	// MergeRequestMergeability reports the mergeability of an open merge request.
	907	+	// It is published when the state changes, or when a check settles a result
	908	+	// that readers had not seen yet (they saw CHECKING), not on every push.
	909	+	type MergeRequestMergeability struct {
	910	+	state protoimpl.MessageState `protogen:"open.v1"`
	911	+	// Repo is the name of the repository.
	912	+	Repo string `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"`
	913	+	// Number is the number of the merge request.
	914	+	Number int64 `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"`
	915	+	// Mergeability is the new result.
	916	+	Mergeability *Mergeability `protobuf:"bytes,3,opt,name=mergeability,proto3" json:"mergeability,omitempty"`
	917	+	unknownFields protoimpl.UnknownFields
	918	+	sizeCache protoimpl.SizeCache
	919	+	}
	920	+
	921	+	func (x *MergeRequestMergeability) Reset() {
	922	+	*x = MergeRequestMergeability{}
	923	+	mi := &file_ermite_event_proto_msgTypes[10]
	924	+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
	925	+	ms.StoreMessageInfo(mi)
	926	+	}
	927	+
	928	+	func (x *MergeRequestMergeability) String() string {
	929	+	return protoimpl.X.MessageStringOf(x)
	930	+	}
	931	+
	932	+	func (*MergeRequestMergeability) ProtoMessage() {}
	933	+
	934	+	func (x *MergeRequestMergeability) ProtoReflect() protoreflect.Message {
	935	+	mi := &file_ermite_event_proto_msgTypes[10]
	936	+	if x != nil {
	937	+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
	938	+	if ms.LoadMessageInfo() == nil {
	939	+	ms.StoreMessageInfo(mi)
	940	+	}
	941	+	return ms
	942	+	}
	943	+	return mi.MessageOf(x)
	944	+	}
	945	+
	946	+	// Deprecated: Use MergeRequestMergeability.ProtoReflect.Descriptor instead.
	947	+	func (*MergeRequestMergeability) Descriptor() ([]byte, []int) {
	948	+	return file_ermite_event_proto_rawDescGZIP(), []int{10}
	949	+	}
	950	+
	951	+	func (x *MergeRequestMergeability) GetRepo() string {
	952	+	if x != nil {
	953	+	return x.Repo
	954	+	}
	955	+	return ""
	956	+	}
	957	+
	958	+	func (x *MergeRequestMergeability) GetNumber() int64 {
	959	+	if x != nil {
	960	+	return x.Number
	961	+	}
	962	+	return 0
	963	+	}
	964	+
	965	+	func (x MergeRequestMergeability) GetMergeability() Mergeability {
	966	+	if x != nil {
	967	+	return x.Mergeability
	968	+	}
	969	+	return nil
	970	+	}
	971	+
888	972		// MergeRequestClosed reports a merge request closed without merging.
889	973		type MergeRequestClosed struct {
890	974		state protoimpl.MessageState `protogen:"open.v1"`

@@ -896,7 +980,7 @@ type MergeRequestClosed struct {
896	980
897	981		func (x *MergeRequestClosed) Reset() {
898	982		*x = MergeRequestClosed{}
899		-	mi := &file_ermite_event_proto_msgTypes[10]
	983	+	mi := &file_ermite_event_proto_msgTypes[11]
900	984		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
901	985		ms.StoreMessageInfo(mi)
902	986		}

@@ -908,7 +992,7 @@ func (x *MergeRequestClosed) String() string {
908	992		func (*MergeRequestClosed) ProtoMessage() {}
909	993
910	994		func (x *MergeRequestClosed) ProtoReflect() protoreflect.Message {
911		-	mi := &file_ermite_event_proto_msgTypes[10]
	995	+	mi := &file_ermite_event_proto_msgTypes[11]
912	996		if x != nil {
913	997		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
914	998		if ms.LoadMessageInfo() == nil {

@@ -921,7 +1005,7 @@ func (x *MergeRequestClosed) ProtoReflect() protoreflect.Message {
921	1005
922	1006		// Deprecated: Use MergeRequestClosed.ProtoReflect.Descriptor instead.
923	1007		func (*MergeRequestClosed) Descriptor() ([]byte, []int) {
924		-	return file_ermite_event_proto_rawDescGZIP(), []int{10}
	1008	+	return file_ermite_event_proto_rawDescGZIP(), []int{11}
925	1009		}
926	1010
927	1011		func (x MergeRequestClosed) GetMergeRequest() MergeRequest {

@@ -946,7 +1030,7 @@ type CommentAdded struct {
946	1030
947	1031		func (x *CommentAdded) Reset() {
948	1032		*x = CommentAdded{}
949		-	mi := &file_ermite_event_proto_msgTypes[11]
	1033	+	mi := &file_ermite_event_proto_msgTypes[12]
950	1034		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
951	1035		ms.StoreMessageInfo(mi)
952	1036		}

@@ -958,7 +1042,7 @@ func (x *CommentAdded) String() string {
958	1042		func (*CommentAdded) ProtoMessage() {}
959	1043
960	1044		func (x *CommentAdded) ProtoReflect() protoreflect.Message {
961		-	mi := &file_ermite_event_proto_msgTypes[11]
	1045	+	mi := &file_ermite_event_proto_msgTypes[12]
962	1046		if x != nil {
963	1047		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
964	1048		if ms.LoadMessageInfo() == nil {

@@ -971,7 +1055,7 @@ func (x *CommentAdded) ProtoReflect() protoreflect.Message {
971	1055
972	1056		// Deprecated: Use CommentAdded.ProtoReflect.Descriptor instead.
973	1057		func (*CommentAdded) Descriptor() ([]byte, []int) {
974		-	return file_ermite_event_proto_rawDescGZIP(), []int{11}
	1058	+	return file_ermite_event_proto_rawDescGZIP(), []int{12}
975	1059		}
976	1060
977	1061		func (x *CommentAdded) GetRepo() string {

@@ -1010,7 +1094,7 @@ type CommentEdited struct {
1010	1094
1011	1095		func (x *CommentEdited) Reset() {
1012	1096		*x = CommentEdited{}
1013		-	mi := &file_ermite_event_proto_msgTypes[12]
	1097	+	mi := &file_ermite_event_proto_msgTypes[13]
1014	1098		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1015	1099		ms.StoreMessageInfo(mi)
1016	1100		}

@@ -1022,7 +1106,7 @@ func (x *CommentEdited) String() string {
1022	1106		func (*CommentEdited) ProtoMessage() {}
1023	1107
1024	1108		func (x *CommentEdited) ProtoReflect() protoreflect.Message {
1025		-	mi := &file_ermite_event_proto_msgTypes[12]
	1109	+	mi := &file_ermite_event_proto_msgTypes[13]
1026	1110		if x != nil {
1027	1111		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1028	1112		if ms.LoadMessageInfo() == nil {

@@ -1035,7 +1119,7 @@ func (x *CommentEdited) ProtoReflect() protoreflect.Message {
1035	1119
1036	1120		// Deprecated: Use CommentEdited.ProtoReflect.Descriptor instead.
1037	1121		func (*CommentEdited) Descriptor() ([]byte, []int) {
1038		-	return file_ermite_event_proto_rawDescGZIP(), []int{12}
	1122	+	return file_ermite_event_proto_rawDescGZIP(), []int{13}
1039	1123		}
1040	1124
1041	1125		func (x *CommentEdited) GetRepo() string {

@@ -1075,7 +1159,7 @@ type CommentDeleted struct {
1075	1159
1076	1160		func (x *CommentDeleted) Reset() {
1077	1161		*x = CommentDeleted{}
1078		-	mi := &file_ermite_event_proto_msgTypes[13]
	1162	+	mi := &file_ermite_event_proto_msgTypes[14]
1079	1163		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1080	1164		ms.StoreMessageInfo(mi)
1081	1165		}

@@ -1087,7 +1171,7 @@ func (x *CommentDeleted) String() string {
1087	1171		func (*CommentDeleted) ProtoMessage() {}
1088	1172
1089	1173		func (x *CommentDeleted) ProtoReflect() protoreflect.Message {
1090		-	mi := &file_ermite_event_proto_msgTypes[13]
	1174	+	mi := &file_ermite_event_proto_msgTypes[14]
1091	1175		if x != nil {
1092	1176		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1093	1177		if ms.LoadMessageInfo() == nil {

@@ -1100,7 +1184,7 @@ func (x *CommentDeleted) ProtoReflect() protoreflect.Message {
1100	1184
1101	1185		// Deprecated: Use CommentDeleted.ProtoReflect.Descriptor instead.
1102	1186		func (*CommentDeleted) Descriptor() ([]byte, []int) {
1103		-	return file_ermite_event_proto_rawDescGZIP(), []int{13}
	1187	+	return file_ermite_event_proto_rawDescGZIP(), []int{14}
1104	1188		}
1105	1189
1106	1190		func (x *CommentDeleted) GetRepo() string {

@@ -1140,7 +1224,7 @@ type CommentResolved struct {
1140	1224
1141	1225		func (x *CommentResolved) Reset() {
1142	1226		*x = CommentResolved{}
1143		-	mi := &file_ermite_event_proto_msgTypes[14]
	1227	+	mi := &file_ermite_event_proto_msgTypes[15]
1144	1228		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1145	1229		ms.StoreMessageInfo(mi)
1146	1230		}

@@ -1152,7 +1236,7 @@ func (x *CommentResolved) String() string {
1152	1236		func (*CommentResolved) ProtoMessage() {}
1153	1237
1154	1238		func (x *CommentResolved) ProtoReflect() protoreflect.Message {
1155		-	mi := &file_ermite_event_proto_msgTypes[14]
	1239	+	mi := &file_ermite_event_proto_msgTypes[15]
1156	1240		if x != nil {
1157	1241		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1158	1242		if ms.LoadMessageInfo() == nil {

@@ -1165,7 +1249,7 @@ func (x *CommentResolved) ProtoReflect() protoreflect.Message {
1165	1249
1166	1250		// Deprecated: Use CommentResolved.ProtoReflect.Descriptor instead.
1167	1251		func (*CommentResolved) Descriptor() ([]byte, []int) {
1168		-	return file_ermite_event_proto_rawDescGZIP(), []int{14}
	1252	+	return file_ermite_event_proto_rawDescGZIP(), []int{15}
1169	1253		}
1170	1254
1171	1255		func (x *CommentResolved) GetRepo() string {

@@ -1200,7 +1284,7 @@ type IssueOpened struct {
1200	1284
1201	1285		func (x *IssueOpened) Reset() {
1202	1286		*x = IssueOpened{}
1203		-	mi := &file_ermite_event_proto_msgTypes[15]
	1287	+	mi := &file_ermite_event_proto_msgTypes[16]
1204	1288		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1205	1289		ms.StoreMessageInfo(mi)
1206	1290		}

@@ -1212,7 +1296,7 @@ func (x *IssueOpened) String() string {
1212	1296		func (*IssueOpened) ProtoMessage() {}
1213	1297
1214	1298		func (x *IssueOpened) ProtoReflect() protoreflect.Message {
1215		-	mi := &file_ermite_event_proto_msgTypes[15]
	1299	+	mi := &file_ermite_event_proto_msgTypes[16]
1216	1300		if x != nil {
1217	1301		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1218	1302		if ms.LoadMessageInfo() == nil {

@@ -1225,7 +1309,7 @@ func (x *IssueOpened) ProtoReflect() protoreflect.Message {
1225	1309
1226	1310		// Deprecated: Use IssueOpened.ProtoReflect.Descriptor instead.
1227	1311		func (*IssueOpened) Descriptor() ([]byte, []int) {
1228		-	return file_ermite_event_proto_rawDescGZIP(), []int{15}
	1312	+	return file_ermite_event_proto_rawDescGZIP(), []int{16}
1229	1313		}
1230	1314
1231	1315		func (x IssueOpened) GetIssue() Issue {

@@ -1246,7 +1330,7 @@ type IssueClosed struct {
1246	1330
1247	1331		func (x *IssueClosed) Reset() {
1248	1332		*x = IssueClosed{}
1249		-	mi := &file_ermite_event_proto_msgTypes[16]
	1333	+	mi := &file_ermite_event_proto_msgTypes[17]
1250	1334		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1251	1335		ms.StoreMessageInfo(mi)
1252	1336		}

@@ -1258,7 +1342,7 @@ func (x *IssueClosed) String() string {
1258	1342		func (*IssueClosed) ProtoMessage() {}
1259	1343
1260	1344		func (x *IssueClosed) ProtoReflect() protoreflect.Message {
1261		-	mi := &file_ermite_event_proto_msgTypes[16]
	1345	+	mi := &file_ermite_event_proto_msgTypes[17]
1262	1346		if x != nil {
1263	1347		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1264	1348		if ms.LoadMessageInfo() == nil {

@@ -1271,7 +1355,7 @@ func (x *IssueClosed) ProtoReflect() protoreflect.Message {
1271	1355
1272	1356		// Deprecated: Use IssueClosed.ProtoReflect.Descriptor instead.
1273	1357		func (*IssueClosed) Descriptor() ([]byte, []int) {
1274		-	return file_ermite_event_proto_rawDescGZIP(), []int{16}
	1358	+	return file_ermite_event_proto_rawDescGZIP(), []int{17}
1275	1359		}
1276	1360
1277	1361		func (x IssueClosed) GetIssue() Issue {

@@ -1292,7 +1376,7 @@ type IssueReopened struct {
1292	1376
1293	1377		func (x *IssueReopened) Reset() {
1294	1378		*x = IssueReopened{}
1295		-	mi := &file_ermite_event_proto_msgTypes[17]
	1379	+	mi := &file_ermite_event_proto_msgTypes[18]
1296	1380		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1297	1381		ms.StoreMessageInfo(mi)
1298	1382		}

@@ -1304,7 +1388,7 @@ func (x *IssueReopened) String() string {
1304	1388		func (*IssueReopened) ProtoMessage() {}
1305	1389
1306	1390		func (x *IssueReopened) ProtoReflect() protoreflect.Message {
1307		-	mi := &file_ermite_event_proto_msgTypes[17]
	1391	+	mi := &file_ermite_event_proto_msgTypes[18]
1308	1392		if x != nil {
1309	1393		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1310	1394		if ms.LoadMessageInfo() == nil {

@@ -1317,7 +1401,7 @@ func (x *IssueReopened) ProtoReflect() protoreflect.Message {
1317	1401
1318	1402		// Deprecated: Use IssueReopened.ProtoReflect.Descriptor instead.
1319	1403		func (*IssueReopened) Descriptor() ([]byte, []int) {
1320		-	return file_ermite_event_proto_rawDescGZIP(), []int{17}
	1404	+	return file_ermite_event_proto_rawDescGZIP(), []int{18}
1321	1405		}
1322	1406
1323	1407		func (x IssueReopened) GetIssue() Issue {

@@ -1342,7 +1426,7 @@ type IssueCommented struct {
1342	1426
1343	1427		func (x *IssueCommented) Reset() {
1344	1428		*x = IssueCommented{}
1345		-	mi := &file_ermite_event_proto_msgTypes[18]
	1429	+	mi := &file_ermite_event_proto_msgTypes[19]
1346	1430		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1347	1431		ms.StoreMessageInfo(mi)
1348	1432		}

@@ -1354,7 +1438,7 @@ func (x *IssueCommented) String() string {
1354	1438		func (*IssueCommented) ProtoMessage() {}
1355	1439
1356	1440		func (x *IssueCommented) ProtoReflect() protoreflect.Message {
1357		-	mi := &file_ermite_event_proto_msgTypes[18]
	1441	+	mi := &file_ermite_event_proto_msgTypes[19]
1358	1442		if x != nil {
1359	1443		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1360	1444		if ms.LoadMessageInfo() == nil {

@@ -1367,7 +1451,7 @@ func (x *IssueCommented) ProtoReflect() protoreflect.Message {
1367	1451
1368	1452		// Deprecated: Use IssueCommented.ProtoReflect.Descriptor instead.
1369	1453		func (*IssueCommented) Descriptor() ([]byte, []int) {
1370		-	return file_ermite_event_proto_rawDescGZIP(), []int{18}
	1454	+	return file_ermite_event_proto_rawDescGZIP(), []int{19}
1371	1455		}
1372	1456
1373	1457		func (x *IssueCommented) GetRepo() string {

@@ -1406,7 +1490,7 @@ type IssueSubmitted struct {
1406	1490
1407	1491		func (x *IssueSubmitted) Reset() {
1408	1492		*x = IssueSubmitted{}
1409		-	mi := &file_ermite_event_proto_msgTypes[19]
	1493	+	mi := &file_ermite_event_proto_msgTypes[20]
1410	1494		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1411	1495		ms.StoreMessageInfo(mi)
1412	1496		}

@@ -1418,7 +1502,7 @@ func (x *IssueSubmitted) String() string {
1418	1502		func (*IssueSubmitted) ProtoMessage() {}
1419	1503
1420	1504		func (x *IssueSubmitted) ProtoReflect() protoreflect.Message {
1421		-	mi := &file_ermite_event_proto_msgTypes[19]
	1505	+	mi := &file_ermite_event_proto_msgTypes[20]
1422	1506		if x != nil {
1423	1507		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1424	1508		if ms.LoadMessageInfo() == nil {

@@ -1431,7 +1515,7 @@ func (x *IssueSubmitted) ProtoReflect() protoreflect.Message {
1431	1515
1432	1516		// Deprecated: Use IssueSubmitted.ProtoReflect.Descriptor instead.
1433	1517		func (*IssueSubmitted) Descriptor() ([]byte, []int) {
1434		-	return file_ermite_event_proto_rawDescGZIP(), []int{19}
	1518	+	return file_ermite_event_proto_rawDescGZIP(), []int{20}
1435	1519		}
1436	1520
1437	1521		func (x *IssueSubmitted) GetRepo() string {

@@ -1461,7 +1545,7 @@ type Gap struct {
1461	1545
1462	1546		func (x *Gap) Reset() {
1463	1547		*x = Gap{}
1464		-	mi := &file_ermite_event_proto_msgTypes[20]
	1548	+	mi := &file_ermite_event_proto_msgTypes[21]
1465	1549		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1466	1550		ms.StoreMessageInfo(mi)
1467	1551		}

@@ -1473,7 +1557,7 @@ func (x *Gap) String() string {
1473	1557		func (*Gap) ProtoMessage() {}
1474	1558
1475	1559		func (x *Gap) ProtoReflect() protoreflect.Message {
1476		-	mi := &file_ermite_event_proto_msgTypes[20]
	1560	+	mi := &file_ermite_event_proto_msgTypes[21]
1477	1561		if x != nil {
1478	1562		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1479	1563		if ms.LoadMessageInfo() == nil {

@@ -1486,7 +1570,7 @@ func (x *Gap) ProtoReflect() protoreflect.Message {
1486	1570
1487	1571		// Deprecated: Use Gap.ProtoReflect.Descriptor instead.
1488	1572		func (*Gap) Descriptor() ([]byte, []int) {
1489		-	return file_ermite_event_proto_rawDescGZIP(), []int{20}
	1573	+	return file_ermite_event_proto_rawDescGZIP(), []int{21}
1490	1574		}
1491	1575
1492	1576		// RunUpdated reports a CI run that was created or whose status, conclusion or

@@ -1501,7 +1585,7 @@ type RunUpdated struct {
1501	1585
1502	1586		func (x *RunUpdated) Reset() {
1503	1587		*x = RunUpdated{}
1504		-	mi := &file_ermite_event_proto_msgTypes[21]
	1588	+	mi := &file_ermite_event_proto_msgTypes[22]
1505	1589		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1506	1590		ms.StoreMessageInfo(mi)
1507	1591		}

@@ -1513,7 +1597,7 @@ func (x *RunUpdated) String() string {
1513	1597		func (*RunUpdated) ProtoMessage() {}
1514	1598
1515	1599		func (x *RunUpdated) ProtoReflect() protoreflect.Message {
1516		-	mi := &file_ermite_event_proto_msgTypes[21]
	1600	+	mi := &file_ermite_event_proto_msgTypes[22]
1517	1601		if x != nil {
1518	1602		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1519	1603		if ms.LoadMessageInfo() == nil {

@@ -1526,7 +1610,7 @@ func (x *RunUpdated) ProtoReflect() protoreflect.Message {
1526	1610
1527	1611		// Deprecated: Use RunUpdated.ProtoReflect.Descriptor instead.
1528	1612		func (*RunUpdated) Descriptor() ([]byte, []int) {
1529		-	return file_ermite_event_proto_rawDescGZIP(), []int{21}
	1613	+	return file_ermite_event_proto_rawDescGZIP(), []int{22}
1530	1614		}
1531	1615
1532	1616		func (x RunUpdated) GetRun() Run {

@@ -1548,7 +1632,7 @@ type JobUpdated struct {
1548	1632
1549	1633		func (x *JobUpdated) Reset() {
1550	1634		*x = JobUpdated{}
1551		-	mi := &file_ermite_event_proto_msgTypes[22]
	1635	+	mi := &file_ermite_event_proto_msgTypes[23]
1552	1636		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1553	1637		ms.StoreMessageInfo(mi)
1554	1638		}

@@ -1560,7 +1644,7 @@ func (x *JobUpdated) String() string {
1560	1644		func (*JobUpdated) ProtoMessage() {}
1561	1645
1562	1646		func (x *JobUpdated) ProtoReflect() protoreflect.Message {
1563		-	mi := &file_ermite_event_proto_msgTypes[22]
	1647	+	mi := &file_ermite_event_proto_msgTypes[23]
1564	1648		if x != nil {
1565	1649		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
1566	1650		if ms.LoadMessageInfo() == nil {

@@ -1573,7 +1657,7 @@ func (x *JobUpdated) ProtoReflect() protoreflect.Message {
1573	1657
1574	1658		// Deprecated: Use JobUpdated.ProtoReflect.Descriptor instead.
1575	1659		func (*JobUpdated) Descriptor() ([]byte, []int) {
1576		-	return file_ermite_event_proto_rawDescGZIP(), []int{22}
	1660	+	return file_ermite_event_proto_rawDescGZIP(), []int{23}
1577	1661		}
1578	1662
1579	1663		func (x JobUpdated) GetJob() RunJob {

@@ -1592,7 +1676,8 @@ const file_ermite_event_proto_rawDesc = "" +
1592	1676		"\x06topics\x18\x01 \x03(\tR\x06topics\x12!\n" +
1593	1677		"\fresume_after\x18\x02 \x01(\tR\vresumeAfter\"4\n" +
1594	1678		"\rWatchResponse\x12#\n" +
1595		-	"\x05event\x18\x01 \x01(\v2\r.ermite.EventR\x05event\"\xe6\t\n" +
	1679	+	"\x05event\x18\x01 \x01(\v2\r.ermite.EventR\x05event\"\xc8\n" +
	1680	+	"\n" +
1596	1681		"\x05Event\x12\x0e\n" +
1597	1682		"\x02id\x18\x01 \x01(\tR\x02id\x12.\n" +
1598	1683		"\x04time\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\x04time\x128\n" +

@@ -1617,7 +1702,8 @@ const file_ermite_event_proto_rawDesc = "" +
1617	1702		"\fissue_closed\x18\x12 \x01(\v2\x13.ermite.IssueClosedH\x00R\vissueClosed\x12>\n" +
1618	1703		"\x0eissue_reopened\x18\x13 \x01(\v2\x15.ermite.IssueReopenedH\x00R\rissueReopened\x12A\n" +
1619	1704		"\x0fissue_commented\x18\x14 \x01(\v2\x16.ermite.IssueCommentedH\x00R\x0eissueCommented\x12A\n" +
1620		-	"\x0fissue_submitted\x18\x15 \x01(\v2\x16.ermite.IssueSubmittedH\x00R\x0eissueSubmittedB\x06\n" +
	1705	+	"\x0fissue_submitted\x18\x15 \x01(\v2\x16.ermite.IssueSubmittedH\x00R\x0eissueSubmitted\x12`\n" +
	1706	+	"\x1amerge_request_mergeability\x18\x16 \x01(\v2 .ermite.MergeRequestMergeabilityH\x00R\x18mergeRequestMergeabilityB\x06\n" +
1621	1707		"\x04kind\"/\n" +
1622	1708		"\vRepoCreated\x12 \n" +
1623	1709		"\x04repo\x18\x01 \x01(\v2\f.ermite.RepoR\x04repo\"/\n" +

@@ -1636,7 +1722,11 @@ const file_ermite_event_proto_rawDesc = "" +
1636	1722		"\x12MergeRequestOpened\x129\n" +
1637	1723		"\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"O\n" +
1638	1724		"\x12MergeRequestMerged\x129\n" +
1639		-	"\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"O\n" +
	1725	+	"\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"\x80\x01\n" +
	1726	+	"\x18MergeRequestMergeability\x12\x12\n" +
	1727	+	"\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" +
	1728	+	"\x06number\x18\x02 \x01(\x03R\x06number\x128\n" +
	1729	+	"\fmergeability\x18\x03 \x01(\v2\x14.ermite.MergeabilityR\fmergeability\"O\n" +
1640	1730		"\x12MergeRequestClosed\x129\n" +
1641	1731		"\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"e\n" +
1642	1732		"\fCommentAdded\x12\x12\n" +

@@ -1693,85 +1783,89 @@ func file_ermite_event_proto_rawDescGZIP() []byte {
1693	1783		return file_ermite_event_proto_rawDescData
1694	1784		}
1695	1785
1696		-	var file_ermite_event_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
	1786	+	var file_ermite_event_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
1697	1787		var file_ermite_event_proto_goTypes = []any{
1698		-	(*WatchRequest)(nil), // 0: ermite.WatchRequest
1699		-	(*WatchResponse)(nil), // 1: ermite.WatchResponse
1700		-	(*Event)(nil), // 2: ermite.Event
1701		-	(*RepoCreated)(nil), // 3: ermite.RepoCreated
1702		-	(*RepoUpdated)(nil), // 4: ermite.RepoUpdated
1703		-	(*RepoDeleted)(nil), // 5: ermite.RepoDeleted
1704		-	(*Pushed)(nil), // 6: ermite.Pushed
1705		-	(*RefUpdate)(nil), // 7: ermite.RefUpdate
1706		-	(*MergeRequestOpened)(nil), // 8: ermite.MergeRequestOpened
1707		-	(*MergeRequestMerged)(nil), // 9: ermite.MergeRequestMerged
1708		-	(*MergeRequestClosed)(nil), // 10: ermite.MergeRequestClosed
1709		-	(*CommentAdded)(nil), // 11: ermite.CommentAdded
1710		-	(*CommentEdited)(nil), // 12: ermite.CommentEdited
1711		-	(*CommentDeleted)(nil), // 13: ermite.CommentDeleted
1712		-	(*CommentResolved)(nil), // 14: ermite.CommentResolved
1713		-	(*IssueOpened)(nil), // 15: ermite.IssueOpened
1714		-	(*IssueClosed)(nil), // 16: ermite.IssueClosed
1715		-	(*IssueReopened)(nil), // 17: ermite.IssueReopened
1716		-	(*IssueCommented)(nil), // 18: ermite.IssueCommented
1717		-	(*IssueSubmitted)(nil), // 19: ermite.IssueSubmitted
1718		-	(*Gap)(nil), // 20: ermite.Gap
1719		-	(*RunUpdated)(nil), // 21: ermite.RunUpdated
1720		-	(*JobUpdated)(nil), // 22: ermite.JobUpdated
1721		-	(*timestamppb.Timestamp)(nil), // 23: google.protobuf.Timestamp
1722		-	(*Repo)(nil), // 24: ermite.Repo
1723		-	(*MergeRequest)(nil), // 25: ermite.MergeRequest
1724		-	(*Comment)(nil), // 26: ermite.Comment
1725		-	(*Issue)(nil), // 27: ermite.Issue
1726		-	(*IssueComment)(nil), // 28: ermite.IssueComment
1727		-	(*Run)(nil), // 29: ermite.Run
1728		-	(*RunJob)(nil), // 30: ermite.RunJob
	1788	+	(*WatchRequest)(nil), // 0: ermite.WatchRequest
	1789	+	(*WatchResponse)(nil), // 1: ermite.WatchResponse
	1790	+	(*Event)(nil), // 2: ermite.Event
	1791	+	(*RepoCreated)(nil), // 3: ermite.RepoCreated
	1792	+	(*RepoUpdated)(nil), // 4: ermite.RepoUpdated
	1793	+	(*RepoDeleted)(nil), // 5: ermite.RepoDeleted
	1794	+	(*Pushed)(nil), // 6: ermite.Pushed
	1795	+	(*RefUpdate)(nil), // 7: ermite.RefUpdate
	1796	+	(*MergeRequestOpened)(nil), // 8: ermite.MergeRequestOpened
	1797	+	(*MergeRequestMerged)(nil), // 9: ermite.MergeRequestMerged
	1798	+	(*MergeRequestMergeability)(nil), // 10: ermite.MergeRequestMergeability
	1799	+	(*MergeRequestClosed)(nil), // 11: ermite.MergeRequestClosed
	1800	+	(*CommentAdded)(nil), // 12: ermite.CommentAdded
	1801	+	(*CommentEdited)(nil), // 13: ermite.CommentEdited
	1802	+	(*CommentDeleted)(nil), // 14: ermite.CommentDeleted
	1803	+	(*CommentResolved)(nil), // 15: ermite.CommentResolved
	1804	+	(*IssueOpened)(nil), // 16: ermite.IssueOpened
	1805	+	(*IssueClosed)(nil), // 17: ermite.IssueClosed
	1806	+	(*IssueReopened)(nil), // 18: ermite.IssueReopened
	1807	+	(*IssueCommented)(nil), // 19: ermite.IssueCommented
	1808	+	(*IssueSubmitted)(nil), // 20: ermite.IssueSubmitted
	1809	+	(*Gap)(nil), // 21: ermite.Gap
	1810	+	(*RunUpdated)(nil), // 22: ermite.RunUpdated
	1811	+	(*JobUpdated)(nil), // 23: ermite.JobUpdated
	1812	+	(*timestamppb.Timestamp)(nil), // 24: google.protobuf.Timestamp
	1813	+	(*Repo)(nil), // 25: ermite.Repo
	1814	+	(*MergeRequest)(nil), // 26: ermite.MergeRequest
	1815	+	(*Mergeability)(nil), // 27: ermite.Mergeability
	1816	+	(*Comment)(nil), // 28: ermite.Comment
	1817	+	(*Issue)(nil), // 29: ermite.Issue
	1818	+	(*IssueComment)(nil), // 30: ermite.IssueComment
	1819	+	(*Run)(nil), // 31: ermite.Run
	1820	+	(*RunJob)(nil), // 32: ermite.RunJob
1729	1821		}
1730	1822		var file_ermite_event_proto_depIdxs = []int32{
1731	1823		2, // 0: ermite.WatchResponse.event:type_name -> ermite.Event
1732		-	23, // 1: ermite.Event.time:type_name -> google.protobuf.Timestamp
	1824	+	24, // 1: ermite.Event.time:type_name -> google.protobuf.Timestamp
1733	1825		3, // 2: ermite.Event.repo_created:type_name -> ermite.RepoCreated
1734	1826		4, // 3: ermite.Event.repo_updated:type_name -> ermite.RepoUpdated
1735	1827		5, // 4: ermite.Event.repo_deleted:type_name -> ermite.RepoDeleted
1736	1828		6, // 5: ermite.Event.pushed:type_name -> ermite.Pushed
1737		-	20, // 6: ermite.Event.gap:type_name -> ermite.Gap
	1829	+	21, // 6: ermite.Event.gap:type_name -> ermite.Gap
1738	1830		8, // 7: ermite.Event.merge_request_opened:type_name -> ermite.MergeRequestOpened
1739	1831		9, // 8: ermite.Event.merge_request_merged:type_name -> ermite.MergeRequestMerged
1740		-	10, // 9: ermite.Event.merge_request_closed:type_name -> ermite.MergeRequestClosed
1741		-	11, // 10: ermite.Event.comment_added:type_name -> ermite.CommentAdded
1742		-	21, // 11: ermite.Event.run_updated:type_name -> ermite.RunUpdated
1743		-	22, // 12: ermite.Event.job_updated:type_name -> ermite.JobUpdated
1744		-	12, // 13: ermite.Event.comment_edited:type_name -> ermite.CommentEdited
1745		-	13, // 14: ermite.Event.comment_deleted:type_name -> ermite.CommentDeleted
1746		-	14, // 15: ermite.Event.comment_resolved:type_name -> ermite.CommentResolved
1747		-	15, // 16: ermite.Event.issue_opened:type_name -> ermite.IssueOpened
1748		-	16, // 17: ermite.Event.issue_closed:type_name -> ermite.IssueClosed
1749		-	17, // 18: ermite.Event.issue_reopened:type_name -> ermite.IssueReopened
1750		-	18, // 19: ermite.Event.issue_commented:type_name -> ermite.IssueCommented
1751		-	19, // 20: ermite.Event.issue_submitted:type_name -> ermite.IssueSubmitted
1752		-	24, // 21: ermite.RepoCreated.repo:type_name -> ermite.Repo
1753		-	24, // 22: ermite.RepoUpdated.repo:type_name -> ermite.Repo
1754		-	7, // 23: ermite.Pushed.ref_updates:type_name -> ermite.RefUpdate
1755		-	25, // 24: ermite.MergeRequestOpened.merge_request:type_name -> ermite.MergeRequest
1756		-	25, // 25: ermite.MergeRequestMerged.merge_request:type_name -> ermite.MergeRequest
1757		-	25, // 26: ermite.MergeRequestClosed.merge_request:type_name -> ermite.MergeRequest
1758		-	26, // 27: ermite.CommentAdded.comment:type_name -> ermite.Comment
1759		-	26, // 28: ermite.CommentEdited.comment:type_name -> ermite.Comment
1760		-	26, // 29: ermite.CommentDeleted.comment:type_name -> ermite.Comment
1761		-	26, // 30: ermite.CommentResolved.comment:type_name -> ermite.Comment
1762		-	27, // 31: ermite.IssueOpened.issue:type_name -> ermite.Issue
1763		-	27, // 32: ermite.IssueClosed.issue:type_name -> ermite.Issue
1764		-	27, // 33: ermite.IssueReopened.issue:type_name -> ermite.Issue
1765		-	28, // 34: ermite.IssueCommented.comment:type_name -> ermite.IssueComment
1766		-	29, // 35: ermite.RunUpdated.run:type_name -> ermite.Run
1767		-	30, // 36: ermite.JobUpdated.job:type_name -> ermite.RunJob
1768		-	0, // 37: ermite.EventService.Watch:input_type -> ermite.WatchRequest
1769		-	1, // 38: ermite.EventService.Watch:output_type -> ermite.WatchResponse
1770		-	38, // [38:39] is the sub-list for method output_type
1771		-	37, // [37:38] is the sub-list for method input_type
1772		-	37, // [37:37] is the sub-list for extension type_name
1773		-	37, // [37:37] is the sub-list for extension extendee
1774		-	0, // [0:37] is the sub-list for field type_name
	1832	+	11, // 9: ermite.Event.merge_request_closed:type_name -> ermite.MergeRequestClosed
	1833	+	12, // 10: ermite.Event.comment_added:type_name -> ermite.CommentAdded
	1834	+	22, // 11: ermite.Event.run_updated:type_name -> ermite.RunUpdated
	1835	+	23, // 12: ermite.Event.job_updated:type_name -> ermite.JobUpdated
	1836	+	13, // 13: ermite.Event.comment_edited:type_name -> ermite.CommentEdited
	1837	+	14, // 14: ermite.Event.comment_deleted:type_name -> ermite.CommentDeleted
	1838	+	15, // 15: ermite.Event.comment_resolved:type_name -> ermite.CommentResolved
	1839	+	16, // 16: ermite.Event.issue_opened:type_name -> ermite.IssueOpened
	1840	+	17, // 17: ermite.Event.issue_closed:type_name -> ermite.IssueClosed
	1841	+	18, // 18: ermite.Event.issue_reopened:type_name -> ermite.IssueReopened
	1842	+	19, // 19: ermite.Event.issue_commented:type_name -> ermite.IssueCommented
	1843	+	20, // 20: ermite.Event.issue_submitted:type_name -> ermite.IssueSubmitted
	1844	+	10, // 21: ermite.Event.merge_request_mergeability:type_name -> ermite.MergeRequestMergeability
	1845	+	25, // 22: ermite.RepoCreated.repo:type_name -> ermite.Repo
	1846	+	25, // 23: ermite.RepoUpdated.repo:type_name -> ermite.Repo
	1847	+	7, // 24: ermite.Pushed.ref_updates:type_name -> ermite.RefUpdate
	1848	+	26, // 25: ermite.MergeRequestOpened.merge_request:type_name -> ermite.MergeRequest
	1849	+	26, // 26: ermite.MergeRequestMerged.merge_request:type_name -> ermite.MergeRequest
	1850	+	27, // 27: ermite.MergeRequestMergeability.mergeability:type_name -> ermite.Mergeability
	1851	+	26, // 28: ermite.MergeRequestClosed.merge_request:type_name -> ermite.MergeRequest
	1852	+	28, // 29: ermite.CommentAdded.comment:type_name -> ermite.Comment
	1853	+	28, // 30: ermite.CommentEdited.comment:type_name -> ermite.Comment
	1854	+	28, // 31: ermite.CommentDeleted.comment:type_name -> ermite.Comment
	1855	+	28, // 32: ermite.CommentResolved.comment:type_name -> ermite.Comment
	1856	+	29, // 33: ermite.IssueOpened.issue:type_name -> ermite.Issue
	1857	+	29, // 34: ermite.IssueClosed.issue:type_name -> ermite.Issue
	1858	+	29, // 35: ermite.IssueReopened.issue:type_name -> ermite.Issue
	1859	+	30, // 36: ermite.IssueCommented.comment:type_name -> ermite.IssueComment
	1860	+	31, // 37: ermite.RunUpdated.run:type_name -> ermite.Run
	1861	+	32, // 38: ermite.JobUpdated.job:type_name -> ermite.RunJob
	1862	+	0, // 39: ermite.EventService.Watch:input_type -> ermite.WatchRequest
	1863	+	1, // 40: ermite.EventService.Watch:output_type -> ermite.WatchResponse
	1864	+	40, // [40:41] is the sub-list for method output_type
	1865	+	39, // [39:40] is the sub-list for method input_type
	1866	+	39, // [39:39] is the sub-list for extension type_name
	1867	+	39, // [39:39] is the sub-list for extension extendee
	1868	+	0, // [0:39] is the sub-list for field type_name
1775	1869		}
1776	1870
1777	1871		func init() { file_ermite_event_proto_init() }

@@ -1803,6 +1897,7 @@ func file_ermite_event_proto_init() {
1803	1897		(*Event_IssueReopened)(nil),
1804	1898		(*Event_IssueCommented)(nil),
1805	1899		(*Event_IssueSubmitted)(nil),
	1900	+	(*Event_MergeRequestMergeability)(nil),
1806	1901		}
1807	1902		type x struct{}
1808	1903		out := protoimpl.TypeBuilder{

@@ -1810,7 +1905,7 @@ func file_ermite_event_proto_init() {
1810	1905		GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
1811	1906		RawDescriptor: unsafe.Slice(unsafe.StringData(file_ermite_event_proto_rawDesc), len(file_ermite_event_proto_rawDesc)),
1812	1907		NumEnums: 0,
1813		-	NumMessages: 23,
	1908	+	NumMessages: 24,
1814	1909		NumExtensions: 0,
1815	1910		NumServices: 1,
1816	1911		},

 	//	*Event_IssueReopened
 	//	*Event_IssueCommented
 	//	*Event_IssueSubmitted
+	//	*Event_MergeRequestMergeability
 	Kind          isEvent_Kind `protobuf_oneof:"kind"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 	return nil
 }
+func (x *Event) GetMergeRequestMergeability() *MergeRequestMergeability {
+	if x != nil {
+		if x, ok := x.Kind.(*Event_MergeRequestMergeability); ok {
+			return x.MergeRequestMergeability
+		}
+	}
+	return nil
+}
 type isEvent_Kind interface {
 	isEvent_Kind()
 }
 	IssueSubmitted *IssueSubmitted `protobuf:"bytes,21,opt,name=issue_submitted,json=issueSubmitted,proto3,oneof"`
 }
+type Event_MergeRequestMergeability struct {
+	// MergeRequestMergeability: the mergeability of an open merge request
+	// changed.
+	MergeRequestMergeability *MergeRequestMergeability `protobuf:"bytes,22,opt,name=merge_request_mergeability,json=mergeRequestMergeability,proto3,oneof"`
+}
 func (*Event_RepoCreated) isEvent_Kind() {}
 func (*Event_RepoUpdated) isEvent_Kind() {}
 func (*Event_IssueSubmitted) isEvent_Kind() {}
+func (*Event_MergeRequestMergeability) isEvent_Kind() {}
 // RepoCreated reports a new repository.
 type RepoCreated struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	return nil
 }
+// MergeRequestMergeability reports the mergeability of an open merge request.
+// It is published when the state changes, or when a check settles a result
+// that readers had not seen yet (they saw CHECKING), not on every push.
+type MergeRequestMergeability struct {
+	state protoimpl.MessageState `protogen:"open.v1"`
+	// Repo is the name of the repository.
+	Repo string `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"`
+	// Number is the number of the merge request.
+	Number int64 `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"`
+	// Mergeability is the new result.
+	Mergeability  *Mergeability `protobuf:"bytes,3,opt,name=mergeability,proto3" json:"mergeability,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+func (x *MergeRequestMergeability) Reset() {
+	*x = MergeRequestMergeability{}
+	mi := &file_ermite_event_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+func (x *MergeRequestMergeability) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+func (*MergeRequestMergeability) ProtoMessage() {}
+func (x *MergeRequestMergeability) ProtoReflect() protoreflect.Message {
+	mi := &file_ermite_event_proto_msgTypes[10]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+// Deprecated: Use MergeRequestMergeability.ProtoReflect.Descriptor instead.
+func (*MergeRequestMergeability) Descriptor() ([]byte, []int) {
+	return file_ermite_event_proto_rawDescGZIP(), []int{10}
+}
+func (x *MergeRequestMergeability) GetRepo() string {
+	if x != nil {
+		return x.Repo
+	}
+	return ""
+}
+func (x *MergeRequestMergeability) GetNumber() int64 {
+	if x != nil {
+		return x.Number
+	}
+	return 0
+}
+func (x *MergeRequestMergeability) GetMergeability() *Mergeability {
+	if x != nil {
+		return x.Mergeability
+	}
+	return nil
+}
 // MergeRequestClosed reports a merge request closed without merging.
 type MergeRequestClosed struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 func (x *MergeRequestClosed) Reset() {
 	*x = MergeRequestClosed{}
-	mi := &file_ermite_event_proto_msgTypes[10]
+	mi := &file_ermite_event_proto_msgTypes[11]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*MergeRequestClosed) ProtoMessage() {}
 func (x *MergeRequestClosed) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[10]
+	mi := &file_ermite_event_proto_msgTypes[11]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use MergeRequestClosed.ProtoReflect.Descriptor instead.
 func (*MergeRequestClosed) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{10}
+	return file_ermite_event_proto_rawDescGZIP(), []int{11}
 }
 func (x *MergeRequestClosed) GetMergeRequest() *MergeRequest {
 func (x *CommentAdded) Reset() {
 	*x = CommentAdded{}
-	mi := &file_ermite_event_proto_msgTypes[11]
+	mi := &file_ermite_event_proto_msgTypes[12]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*CommentAdded) ProtoMessage() {}
 func (x *CommentAdded) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[11]
+	mi := &file_ermite_event_proto_msgTypes[12]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use CommentAdded.ProtoReflect.Descriptor instead.
 func (*CommentAdded) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{11}
+	return file_ermite_event_proto_rawDescGZIP(), []int{12}
 }
 func (x *CommentAdded) GetRepo() string {
 func (x *CommentEdited) Reset() {
 	*x = CommentEdited{}
-	mi := &file_ermite_event_proto_msgTypes[12]
+	mi := &file_ermite_event_proto_msgTypes[13]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*CommentEdited) ProtoMessage() {}
 func (x *CommentEdited) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[12]
+	mi := &file_ermite_event_proto_msgTypes[13]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use CommentEdited.ProtoReflect.Descriptor instead.
 func (*CommentEdited) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{12}
+	return file_ermite_event_proto_rawDescGZIP(), []int{13}
 }
 func (x *CommentEdited) GetRepo() string {
 func (x *CommentDeleted) Reset() {
 	*x = CommentDeleted{}
-	mi := &file_ermite_event_proto_msgTypes[13]
+	mi := &file_ermite_event_proto_msgTypes[14]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*CommentDeleted) ProtoMessage() {}
 func (x *CommentDeleted) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[13]
+	mi := &file_ermite_event_proto_msgTypes[14]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use CommentDeleted.ProtoReflect.Descriptor instead.
 func (*CommentDeleted) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{13}
+	return file_ermite_event_proto_rawDescGZIP(), []int{14}
 }
 func (x *CommentDeleted) GetRepo() string {
 func (x *CommentResolved) Reset() {
 	*x = CommentResolved{}
-	mi := &file_ermite_event_proto_msgTypes[14]
+	mi := &file_ermite_event_proto_msgTypes[15]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*CommentResolved) ProtoMessage() {}
 func (x *CommentResolved) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[14]
+	mi := &file_ermite_event_proto_msgTypes[15]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use CommentResolved.ProtoReflect.Descriptor instead.
 func (*CommentResolved) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{14}
+	return file_ermite_event_proto_rawDescGZIP(), []int{15}
 }
 func (x *CommentResolved) GetRepo() string {
 func (x *IssueOpened) Reset() {
 	*x = IssueOpened{}
-	mi := &file_ermite_event_proto_msgTypes[15]
+	mi := &file_ermite_event_proto_msgTypes[16]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*IssueOpened) ProtoMessage() {}
 func (x *IssueOpened) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[15]
+	mi := &file_ermite_event_proto_msgTypes[16]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use IssueOpened.ProtoReflect.Descriptor instead.
 func (*IssueOpened) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{15}
+	return file_ermite_event_proto_rawDescGZIP(), []int{16}
 }
 func (x *IssueOpened) GetIssue() *Issue {
 func (x *IssueClosed) Reset() {
 	*x = IssueClosed{}
-	mi := &file_ermite_event_proto_msgTypes[16]
+	mi := &file_ermite_event_proto_msgTypes[17]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*IssueClosed) ProtoMessage() {}
 func (x *IssueClosed) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[16]
+	mi := &file_ermite_event_proto_msgTypes[17]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use IssueClosed.ProtoReflect.Descriptor instead.
 func (*IssueClosed) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{16}
+	return file_ermite_event_proto_rawDescGZIP(), []int{17}
 }
 func (x *IssueClosed) GetIssue() *Issue {
 func (x *IssueReopened) Reset() {
 	*x = IssueReopened{}
-	mi := &file_ermite_event_proto_msgTypes[17]
+	mi := &file_ermite_event_proto_msgTypes[18]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*IssueReopened) ProtoMessage() {}
 func (x *IssueReopened) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[17]
+	mi := &file_ermite_event_proto_msgTypes[18]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use IssueReopened.ProtoReflect.Descriptor instead.
 func (*IssueReopened) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{17}
+	return file_ermite_event_proto_rawDescGZIP(), []int{18}
 }
 func (x *IssueReopened) GetIssue() *Issue {
 func (x *IssueCommented) Reset() {
 	*x = IssueCommented{}
-	mi := &file_ermite_event_proto_msgTypes[18]
+	mi := &file_ermite_event_proto_msgTypes[19]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*IssueCommented) ProtoMessage() {}
 func (x *IssueCommented) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[18]
+	mi := &file_ermite_event_proto_msgTypes[19]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use IssueCommented.ProtoReflect.Descriptor instead.
 func (*IssueCommented) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{18}
+	return file_ermite_event_proto_rawDescGZIP(), []int{19}
 }
 func (x *IssueCommented) GetRepo() string {
 func (x *IssueSubmitted) Reset() {
 	*x = IssueSubmitted{}
-	mi := &file_ermite_event_proto_msgTypes[19]
+	mi := &file_ermite_event_proto_msgTypes[20]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*IssueSubmitted) ProtoMessage() {}
 func (x *IssueSubmitted) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[19]
+	mi := &file_ermite_event_proto_msgTypes[20]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use IssueSubmitted.ProtoReflect.Descriptor instead.
 func (*IssueSubmitted) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{19}
+	return file_ermite_event_proto_rawDescGZIP(), []int{20}
 }
 func (x *IssueSubmitted) GetRepo() string {
 func (x *Gap) Reset() {
 	*x = Gap{}
-	mi := &file_ermite_event_proto_msgTypes[20]
+	mi := &file_ermite_event_proto_msgTypes[21]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*Gap) ProtoMessage() {}
 func (x *Gap) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[20]
+	mi := &file_ermite_event_proto_msgTypes[21]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use Gap.ProtoReflect.Descriptor instead.
 func (*Gap) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{20}
+	return file_ermite_event_proto_rawDescGZIP(), []int{21}
 }
 // RunUpdated reports a CI run that was created or whose status, conclusion or
 func (x *RunUpdated) Reset() {
 	*x = RunUpdated{}
-	mi := &file_ermite_event_proto_msgTypes[21]
+	mi := &file_ermite_event_proto_msgTypes[22]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*RunUpdated) ProtoMessage() {}
 func (x *RunUpdated) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[21]
+	mi := &file_ermite_event_proto_msgTypes[22]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use RunUpdated.ProtoReflect.Descriptor instead.
 func (*RunUpdated) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{21}
+	return file_ermite_event_proto_rawDescGZIP(), []int{22}
 }
 func (x *RunUpdated) GetRun() *Run {
 func (x *JobUpdated) Reset() {
 	*x = JobUpdated{}
-	mi := &file_ermite_event_proto_msgTypes[22]
+	mi := &file_ermite_event_proto_msgTypes[23]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 func (*JobUpdated) ProtoMessage() {}
 func (x *JobUpdated) ProtoReflect() protoreflect.Message {
-	mi := &file_ermite_event_proto_msgTypes[22]
+	mi := &file_ermite_event_proto_msgTypes[23]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 // Deprecated: Use JobUpdated.ProtoReflect.Descriptor instead.
 func (*JobUpdated) Descriptor() ([]byte, []int) {
-	return file_ermite_event_proto_rawDescGZIP(), []int{22}
+	return file_ermite_event_proto_rawDescGZIP(), []int{23}
 }
 func (x *JobUpdated) GetJob() *RunJob {
 	"\x06topics\x18\x01 \x03(\tR\x06topics\x12!\n" +
 	"\fresume_after\x18\x02 \x01(\tR\vresumeAfter\"4\n" +
 	"\rWatchResponse\x12#\n" +
-	"\x05event\x18\x01 \x01(\v2\r.ermite.EventR\x05event\"\xe6\t\n" +
+	"\x05event\x18\x01 \x01(\v2\r.ermite.EventR\x05event\"\xc8\n" +
+	"\n" +
 	"\x05Event\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12.\n" +
 	"\x04time\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\x04time\x128\n" +
 	"\fissue_closed\x18\x12 \x01(\v2\x13.ermite.IssueClosedH\x00R\vissueClosed\x12>\n" +
 	"\x0eissue_reopened\x18\x13 \x01(\v2\x15.ermite.IssueReopenedH\x00R\rissueReopened\x12A\n" +
 	"\x0fissue_commented\x18\x14 \x01(\v2\x16.ermite.IssueCommentedH\x00R\x0eissueCommented\x12A\n" +
-	"\x0fissue_submitted\x18\x15 \x01(\v2\x16.ermite.IssueSubmittedH\x00R\x0eissueSubmittedB\x06\n" +
+	"\x0fissue_submitted\x18\x15 \x01(\v2\x16.ermite.IssueSubmittedH\x00R\x0eissueSubmitted\x12`\n" +
+	"\x1amerge_request_mergeability\x18\x16 \x01(\v2 .ermite.MergeRequestMergeabilityH\x00R\x18mergeRequestMergeabilityB\x06\n" +
 	"\x04kind\"/\n" +
 	"\vRepoCreated\x12 \n" +
 	"\x04repo\x18\x01 \x01(\v2\f.ermite.RepoR\x04repo\"/\n" +
 	"\x12MergeRequestOpened\x129\n" +
 	"\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"O\n" +
 	"\x12MergeRequestMerged\x129\n" +
-	"\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"O\n" +
+	"\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"\x80\x01\n" +
+	"\x18MergeRequestMergeability\x12\x12\n" +
+	"\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" +
+	"\x06number\x18\x02 \x01(\x03R\x06number\x128\n" +
+	"\fmergeability\x18\x03 \x01(\v2\x14.ermite.MergeabilityR\fmergeability\"O\n" +
 	"\x12MergeRequestClosed\x129\n" +
 	"\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"e\n" +
 	"\fCommentAdded\x12\x12\n" +
 	return file_ermite_event_proto_rawDescData
 }
-var file_ermite_event_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
+var file_ermite_event_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
 var file_ermite_event_proto_goTypes = []any{
-	(*WatchRequest)(nil),          // 0: ermite.WatchRequest
+	(*WatchRequest)(nil),             // 0: ermite.WatchRequest
-	(*WatchResponse)(nil),         // 1: ermite.WatchResponse
+	(*WatchResponse)(nil),            // 1: ermite.WatchResponse
-	(*Event)(nil),                 // 2: ermite.Event
+	(*Event)(nil),                    // 2: ermite.Event
-	(*RepoCreated)(nil),           // 3: ermite.RepoCreated
+	(*RepoCreated)(nil),              // 3: ermite.RepoCreated
-	(*RepoUpdated)(nil),           // 4: ermite.RepoUpdated
+	(*RepoUpdated)(nil),              // 4: ermite.RepoUpdated
-	(*RepoDeleted)(nil),           // 5: ermite.RepoDeleted
+	(*RepoDeleted)(nil),              // 5: ermite.RepoDeleted
-	(*Pushed)(nil),                // 6: ermite.Pushed
+	(*Pushed)(nil),                   // 6: ermite.Pushed
-	(*RefUpdate)(nil),             // 7: ermite.RefUpdate
+	(*RefUpdate)(nil),                // 7: ermite.RefUpdate
-	(*MergeRequestOpened)(nil),    // 8: ermite.MergeRequestOpened
+	(*MergeRequestOpened)(nil),       // 8: ermite.MergeRequestOpened
-	(*MergeRequestMerged)(nil),    // 9: ermite.MergeRequestMerged
+	(*MergeRequestMerged)(nil),       // 9: ermite.MergeRequestMerged
-	(*MergeRequestClosed)(nil),    // 10: ermite.MergeRequestClosed
+	(*MergeRequestMergeability)(nil), // 10: ermite.MergeRequestMergeability
-	(*CommentAdded)(nil),          // 11: ermite.CommentAdded
+	(*MergeRequestClosed)(nil),       // 11: ermite.MergeRequestClosed
-	(*CommentEdited)(nil),         // 12: ermite.CommentEdited
+	(*CommentAdded)(nil),             // 12: ermite.CommentAdded
-	(*CommentDeleted)(nil),        // 13: ermite.CommentDeleted
+	(*CommentEdited)(nil),            // 13: ermite.CommentEdited
-	(*CommentResolved)(nil),       // 14: ermite.CommentResolved
+	(*CommentDeleted)(nil),           // 14: ermite.CommentDeleted
-	(*IssueOpened)(nil),           // 15: ermite.IssueOpened
+	(*CommentResolved)(nil),          // 15: ermite.CommentResolved
-	(*IssueClosed)(nil),           // 16: ermite.IssueClosed
+	(*IssueOpened)(nil),              // 16: ermite.IssueOpened
-	(*IssueReopened)(nil),         // 17: ermite.IssueReopened
+	(*IssueClosed)(nil),              // 17: ermite.IssueClosed
-	(*IssueCommented)(nil),        // 18: ermite.IssueCommented
+	(*IssueReopened)(nil),            // 18: ermite.IssueReopened
-	(*IssueSubmitted)(nil),        // 19: ermite.IssueSubmitted
+	(*IssueCommented)(nil),           // 19: ermite.IssueCommented
-	(*Gap)(nil),                   // 20: ermite.Gap
+	(*IssueSubmitted)(nil),           // 20: ermite.IssueSubmitted
-	(*RunUpdated)(nil),            // 21: ermite.RunUpdated
+	(*Gap)(nil),                      // 21: ermite.Gap
-	(*JobUpdated)(nil),            // 22: ermite.JobUpdated
+	(*RunUpdated)(nil),               // 22: ermite.RunUpdated
-	(*timestamppb.Timestamp)(nil), // 23: google.protobuf.Timestamp
+	(*JobUpdated)(nil),               // 23: ermite.JobUpdated
-	(*Repo)(nil),                  // 24: ermite.Repo
+	(*timestamppb.Timestamp)(nil),    // 24: google.protobuf.Timestamp
-	(*MergeRequest)(nil),          // 25: ermite.MergeRequest
+	(*Repo)(nil),                     // 25: ermite.Repo
-	(*Comment)(nil),               // 26: ermite.Comment
+	(*MergeRequest)(nil),             // 26: ermite.MergeRequest
-	(*Issue)(nil),                 // 27: ermite.Issue
+	(*Mergeability)(nil),             // 27: ermite.Mergeability
-	(*IssueComment)(nil),          // 28: ermite.IssueComment
+	(*Comment)(nil),                  // 28: ermite.Comment
-	(*Run)(nil),                   // 29: ermite.Run
+	(*Issue)(nil),                    // 29: ermite.Issue
-	(*RunJob)(nil),                // 30: ermite.RunJob
+	(*IssueComment)(nil),             // 30: ermite.IssueComment
+	(*Run)(nil),                      // 31: ermite.Run
+	(*RunJob)(nil),                   // 32: ermite.RunJob
 }
 var file_ermite_event_proto_depIdxs = []int32{
 	2,  // 0: ermite.WatchResponse.event:type_name -> ermite.Event
-	23, // 1: ermite.Event.time:type_name -> google.protobuf.Timestamp
+	24, // 1: ermite.Event.time:type_name -> google.protobuf.Timestamp
 	3,  // 2: ermite.Event.repo_created:type_name -> ermite.RepoCreated
 	4,  // 3: ermite.Event.repo_updated:type_name -> ermite.RepoUpdated
 	5,  // 4: ermite.Event.repo_deleted:type_name -> ermite.RepoDeleted
 	6,  // 5: ermite.Event.pushed:type_name -> ermite.Pushed
-	20, // 6: ermite.Event.gap:type_name -> ermite.Gap
+	21, // 6: ermite.Event.gap:type_name -> ermite.Gap
 	8,  // 7: ermite.Event.merge_request_opened:type_name -> ermite.MergeRequestOpened
 	9,  // 8: ermite.Event.merge_request_merged:type_name -> ermite.MergeRequestMerged
-	10, // 9: ermite.Event.merge_request_closed:type_name -> ermite.MergeRequestClosed
+	11, // 9: ermite.Event.merge_request_closed:type_name -> ermite.MergeRequestClosed
-	11, // 10: ermite.Event.comment_added:type_name -> ermite.CommentAdded
+	12, // 10: ermite.Event.comment_added:type_name -> ermite.CommentAdded
-	21, // 11: ermite.Event.run_updated:type_name -> ermite.RunUpdated
+	22, // 11: ermite.Event.run_updated:type_name -> ermite.RunUpdated
-	22, // 12: ermite.Event.job_updated:type_name -> ermite.JobUpdated
+	23, // 12: ermite.Event.job_updated:type_name -> ermite.JobUpdated
-	12, // 13: ermite.Event.comment_edited:type_name -> ermite.CommentEdited
+	13, // 13: ermite.Event.comment_edited:type_name -> ermite.CommentEdited
-	13, // 14: ermite.Event.comment_deleted:type_name -> ermite.CommentDeleted
+	14, // 14: ermite.Event.comment_deleted:type_name -> ermite.CommentDeleted
-	14, // 15: ermite.Event.comment_resolved:type_name -> ermite.CommentResolved
+	15, // 15: ermite.Event.comment_resolved:type_name -> ermite.CommentResolved
-	15, // 16: ermite.Event.issue_opened:type_name -> ermite.IssueOpened
+	16, // 16: ermite.Event.issue_opened:type_name -> ermite.IssueOpened
-	16, // 17: ermite.Event.issue_closed:type_name -> ermite.IssueClosed
+	17, // 17: ermite.Event.issue_closed:type_name -> ermite.IssueClosed
-	17, // 18: ermite.Event.issue_reopened:type_name -> ermite.IssueReopened
+	18, // 18: ermite.Event.issue_reopened:type_name -> ermite.IssueReopened
-	18, // 19: ermite.Event.issue_commented:type_name -> ermite.IssueCommented
+	19, // 19: ermite.Event.issue_commented:type_name -> ermite.IssueCommented
-	19, // 20: ermite.Event.issue_submitted:type_name -> ermite.IssueSubmitted
+	20, // 20: ermite.Event.issue_submitted:type_name -> ermite.IssueSubmitted
-	24, // 21: ermite.RepoCreated.repo:type_name -> ermite.Repo
+	10, // 21: ermite.Event.merge_request_mergeability:type_name -> ermite.MergeRequestMergeability
-	24, // 22: ermite.RepoUpdated.repo:type_name -> ermite.Repo
+	25, // 22: ermite.RepoCreated.repo:type_name -> ermite.Repo
-	7,  // 23: ermite.Pushed.ref_updates:type_name -> ermite.RefUpdate
+	25, // 23: ermite.RepoUpdated.repo:type_name -> ermite.Repo
-	25, // 24: ermite.MergeRequestOpened.merge_request:type_name -> ermite.MergeRequest
+	7,  // 24: ermite.Pushed.ref_updates:type_name -> ermite.RefUpdate
-	25, // 25: ermite.MergeRequestMerged.merge_request:type_name -> ermite.MergeRequest
+	26, // 25: ermite.MergeRequestOpened.merge_request:type_name -> ermite.MergeRequest
-	25, // 26: ermite.MergeRequestClosed.merge_request:type_name -> ermite.MergeRequest
+	26, // 26: ermite.MergeRequestMerged.merge_request:type_name -> ermite.MergeRequest
-	26, // 27: ermite.CommentAdded.comment:type_name -> ermite.Comment
+	27, // 27: ermite.MergeRequestMergeability.mergeability:type_name -> ermite.Mergeability
-	26, // 28: ermite.CommentEdited.comment:type_name -> ermite.Comment
+	26, // 28: ermite.MergeRequestClosed.merge_request:type_name -> ermite.MergeRequest
-	26, // 29: ermite.CommentDeleted.comment:type_name -> ermite.Comment
+	28, // 29: ermite.CommentAdded.comment:type_name -> ermite.Comment
-	26, // 30: ermite.CommentResolved.comment:type_name -> ermite.Comment
+	28, // 30: ermite.CommentEdited.comment:type_name -> ermite.Comment
-	27, // 31: ermite.IssueOpened.issue:type_name -> ermite.Issue
+	28, // 31: ermite.CommentDeleted.comment:type_name -> ermite.Comment
-	27, // 32: ermite.IssueClosed.issue:type_name -> ermite.Issue
+	28, // 32: ermite.CommentResolved.comment:type_name -> ermite.Comment
-	27, // 33: ermite.IssueReopened.issue:type_name -> ermite.Issue
+	29, // 33: ermite.IssueOpened.issue:type_name -> ermite.Issue
-	28, // 34: ermite.IssueCommented.comment:type_name -> ermite.IssueComment
+	29, // 34: ermite.IssueClosed.issue:type_name -> ermite.Issue
-	29, // 35: ermite.RunUpdated.run:type_name -> ermite.Run
+	29, // 35: ermite.IssueReopened.issue:type_name -> ermite.Issue
-	30, // 36: ermite.JobUpdated.job:type_name -> ermite.RunJob
+	30, // 36: ermite.IssueCommented.comment:type_name -> ermite.IssueComment
-	0,  // 37: ermite.EventService.Watch:input_type -> ermite.WatchRequest
+	31, // 37: ermite.RunUpdated.run:type_name -> ermite.Run
-	1,  // 38: ermite.EventService.Watch:output_type -> ermite.WatchResponse
+	32, // 38: ermite.JobUpdated.job:type_name -> ermite.RunJob
-	38, // [38:39] is the sub-list for method output_type
+	0,  // 39: ermite.EventService.Watch:input_type -> ermite.WatchRequest
-	37, // [37:38] is the sub-list for method input_type
+	1,  // 40: ermite.EventService.Watch:output_type -> ermite.WatchResponse
-	37, // [37:37] is the sub-list for extension type_name
+	40, // [40:41] is the sub-list for method output_type
-	37, // [37:37] is the sub-list for extension extendee
+	39, // [39:40] is the sub-list for method input_type
-	0,  // [0:37] is the sub-list for field type_name
+	39, // [39:39] is the sub-list for extension type_name
+	39, // [39:39] is the sub-list for extension extendee
+	0,  // [0:39] is the sub-list for field type_name
 }
 func init() { file_ermite_event_proto_init() }
 		(*Event_IssueReopened)(nil),
 		(*Event_IssueCommented)(nil),
 		(*Event_IssueSubmitted)(nil),
+		(*Event_MergeRequestMergeability)(nil),
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_ermite_event_proto_rawDesc), len(file_ermite_event_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   23,
+			NumMessages:   24,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

M gen/ermite/merge_request.pb.go +380 -162 generated file: collapsed

load diff

M gen/ermite/repo.pb.go +2 -2 generated file: collapsed

load diff

M gen/ermite/server.pb.go +4 -1 generated file: collapsed

load diff

M gen/ermite/types.pb.go +20 -7 generated file: collapsed

load diff

M gen_test.go +6 -0


@@ -114,6 +114,12 @@ func TestEnumNumbers(t *testing.T) {
114	114		if got := ermite.MergeMode_MERGE_MODE_SQUASH; got != 2 {
115	115		t.Errorf("MERGE_MODE_SQUASH = %d, want 2", got)
116	116		}
	117	+	if got := ermite.MergeMode_MERGE_MODE_MERGE_COMMIT; got != 3 {
	118	+	t.Errorf("MERGE_MODE_MERGE_COMMIT = %d, want 3", got)
	119	+	}
	120	+	if got := ermite.MergeabilityState_MERGEABILITY_STATE_CONFLICT; got != 4 {
	121	+	t.Errorf("MERGEABILITY_STATE_CONFLICT = %d, want 4", got)
	122	+	}
117	123		if got := ermite.MergeRequestState_MERGE_REQUEST_STATE_CLOSED; got != 3 {
118	124		t.Errorf("MERGE_REQUEST_STATE_CLOSED = %d, want 3", got)
119	125		}


@@ -114,6 +114,12 @@ func TestEnumNumbers(t *testing.T) {
114	if got := ermite.MergeMode_MERGE_MODE_SQUASH; got != 2 {	114		if got := ermite.MergeMode_MERGE_MODE_SQUASH; got != 2 {
115	t.Errorf("MERGE_MODE_SQUASH = %d, want 2", got)	115		t.Errorf("MERGE_MODE_SQUASH = %d, want 2", got)
116	}	116		}
		117	+	if got := ermite.MergeMode_MERGE_MODE_MERGE_COMMIT; got != 3 {
		118	+	t.Errorf("MERGE_MODE_MERGE_COMMIT = %d, want 3", got)
		119	+	}
		120	+	if got := ermite.MergeabilityState_MERGEABILITY_STATE_CONFLICT; got != 4 {
		121	+	t.Errorf("MERGEABILITY_STATE_CONFLICT = %d, want 4", got)
		122	+	}
117	if got := ermite.MergeRequestState_MERGE_REQUEST_STATE_CLOSED; got != 3 {	123		if got := ermite.MergeRequestState_MERGE_REQUEST_STATE_CLOSED; got != 3 {
118	t.Errorf("MERGE_REQUEST_STATE_CLOSED = %d, want 3", got)	124		t.Errorf("MERGE_REQUEST_STATE_CLOSED = %d, want 3", got)
119	}	125		}

M proto/ermite/event.proto +15 -0


@@ -132,6 +132,9 @@ message Event {
132	132		// IssueSubmitted: an issue is awaiting moderation. Delivered only on the
133	133		// "owner" topic, never on "home" or "repo:<name>", and carries no content.
134	134		IssueSubmitted issue_submitted = 21;
	135	+	// MergeRequestMergeability: the mergeability of an open merge request
	136	+	// changed.
	137	+	MergeRequestMergeability merge_request_mergeability = 22;
135	138		}
136	139		}
137	140

@@ -184,6 +187,18 @@ message MergeRequestMerged {
184	187		MergeRequest merge_request = 1;
185	188		}
186	189
	190	+	// MergeRequestMergeability reports the mergeability of an open merge request.
	191	+	// It is published when the state changes, or when a check settles a result
	192	+	// that readers had not seen yet (they saw CHECKING), not on every push.
	193	+	message MergeRequestMergeability {
	194	+	// Repo is the name of the repository.
	195	+	string repo = 1;
	196	+	// Number is the number of the merge request.
	197	+	int64 number = 2;
	198	+	// Mergeability is the new result.
	199	+	Mergeability mergeability = 3;
	200	+	}
	201	+
187	202		// MergeRequestClosed reports a merge request closed without merging.
188	203		message MergeRequestClosed {
189	204		// MergeRequest is the merge request after closing.


@@ -132,6 +132,9 @@ message Event {
132	// IssueSubmitted: an issue is awaiting moderation. Delivered only on the	132		// IssueSubmitted: an issue is awaiting moderation. Delivered only on the
133	// "owner" topic, never on "home" or "repo:<name>", and carries no content.	133		// "owner" topic, never on "home" or "repo:<name>", and carries no content.
134	IssueSubmitted issue_submitted = 21;	134		IssueSubmitted issue_submitted = 21;
		135	+	// MergeRequestMergeability: the mergeability of an open merge request
		136	+	// changed.
		137	+	MergeRequestMergeability merge_request_mergeability = 22;
135	}	138		}
136	}	139		}
137		140

@@ -184,6 +187,18 @@ message MergeRequestMerged {
184	MergeRequest merge_request = 1;	187		MergeRequest merge_request = 1;
185	}	188		}
186		189
		190	+	// MergeRequestMergeability reports the mergeability of an open merge request.
		191	+	// It is published when the state changes, or when a check settles a result
		192	+	// that readers had not seen yet (they saw CHECKING), not on every push.
		193	+	message MergeRequestMergeability {
		194	+	// Repo is the name of the repository.
		195	+	string repo = 1;
		196	+	// Number is the number of the merge request.
		197	+	int64 number = 2;
		198	+	// Mergeability is the new result.
		199	+	Mergeability mergeability = 3;
		200	+	}
		201	+
187	// MergeRequestClosed reports a merge request closed without merging.	202		// MergeRequestClosed reports a merge request closed without merging.
188	message MergeRequestClosed {	203		message MergeRequestClosed {
189	// MergeRequest is the merge request after closing.	204		// MergeRequest is the merge request after closing.

M proto/ermite/merge_request.proto +63 -7


@@ -44,6 +44,50 @@ enum Verdict {
44	44		VERDICT_CHANGES_REQUESTED = 2;
45	45		}
46	46
	47	+	// MergeabilityState tells whether the head of an open merge request can be
	48	+	// merged into its target.
	49	+	enum MergeabilityState {
	50	+	// Not set.
	51	+	MERGEABILITY_STATE_UNSPECIFIED = 0;
	52	+	// The server has no result yet for the current tips of both branches. It
	53	+	// is replaced by another state when the check completes.
	54	+	MERGEABILITY_STATE_CHECKING = 1;
	55	+	// The target is an ancestor of the head: every mode can merge.
	56	+	MERGEABILITY_STATE_UP_TO_DATE = 2;
	57	+	// The target has commits the head lacks, but the head merges cleanly:
	58	+	// squash and merge commit can merge, fast-forward cannot.
	59	+	MERGEABILITY_STATE_BEHIND = 3;
	60	+	// The head does not merge cleanly into the target, or the branches share no
	61	+	// history: no mode can merge.
	62	+	MERGEABILITY_STATE_CONFLICT = 4;
	63	+	}
	64	+
	65	+	// Mergeability is the result of checking an open merge request against the
	66	+	// tips of its branches.
	67	+	message Mergeability {
	68	+	// State is the result.
	69	+	MergeabilityState state = 1;
	70	+	// TargetId is the commit the target branch pointed to when checked. Empty
	71	+	// while CHECKING.
	72	+	string target_id = 2;
	73	+	// HeadId is the commit the source branch pointed to when checked. Empty
	74	+	// while CHECKING.
	75	+	string head_id = 3;
	76	+	// Behind is the number of commits of the target that the head lacks. Set
	77	+	// only when state is BEHIND.
	78	+	int32 behind = 4;
	79	+	// BehindCapped says that Behind is a lower bound: the server stops counting
	80	+	// at 1,000.
	81	+	bool behind_capped = 5;
	82	+	// ConflictPaths are the paths that conflict, at most 20. Set only when
	83	+	// state is CONFLICT; empty when the branches share no history.
	84	+	repeated string conflict_paths = 6;
	85	+	// ConflictPathsTruncated says that more paths conflict than listed.
	86	+	bool conflict_paths_truncated = 7;
	87	+	// CheckedAt is when the server computed the result. Unset while CHECKING.
	88	+	google.protobuf.Timestamp checked_at = 8;
	89	+	}
	90	+
47	91		// MergeRequest asks to merge one branch of a repository into another branch
48	92		// of the same repository. It is about a branch, not about who wrote it.
49	93		message MergeRequest {

@@ -81,12 +125,19 @@ message MergeRequest {
81	125		// merged or closed it is the head at that moment.
82	126		string head_id = 11;
83	127		// MergedCommitId is the id of the commit the target branch points to after
84		-	// the merge: the head for a fast-forward, the new commit for a squash.
	128	+	// the merge: the head for a fast-forward, the new commit for a squash or a
	129	+	// merge commit.
85	130		// Empty unless state is MERGED.
86	131		string merged_commit_id = 12;
87	132		// MergeMode is how the merge request was merged. MERGE_MODE_UNSPECIFIED
88	133		// unless state is MERGED.
89	134		MergeMode merge_mode = 13;
	135	+	// Mergeability tells whether the head can be merged into the target. Set
	136	+	// while the merge request is OPEN, with state CHECKING until the server has
	137	+	// a result for the current tips; never set once merged or closed. It is a
	138	+	// hint: MergeMergeRequest checks again. Set only by servers with the
	139	+	// "merge_requests.mergeability" feature.
	140	+	Mergeability mergeability = 14;
90	141		}
91	142
92	143		// Comment is a note on a merge request, either general or attached to a line

@@ -233,9 +284,12 @@ service MergeRequestService {
233	284		// never merged unseen. Fails with invalid_argument if head_id is empty or
234	285		// not a commit id, and with failed_precondition if the merge request is not
235	286		// open, if the source branch no longer points to head_id ("branch moved,
236		-	// read again"), if the target is not an ancestor of the head (rebase and
237		-	// push again), if the mode is not allowed by RepoSettings, or if a check
238		-	// fails and RepoSettings.failing_checks_block is set. Merges of one
	287	+	// read again"), if the mode is fast-forward and the target is not an
	288	+	// ancestor of the head (rebase and push again, or merge with squash or
	289	+	// merge commit), if the mode is squash or merge commit and the head
	290	+	// conflicts with the target or shares no history with it (rebase and push
	291	+	// again), if the mode is not allowed by RepoSettings, or if a check fails
	292	+	// and RepoSettings.failing_checks_block is set. Merges of one
239	293		// repository run one at a time. Repeating a call that succeeded fails with
240	294		// failed_precondition (not open). On success the server publishes
241	295		// MergeRequestMerged then Pushed for the target branch.

@@ -477,9 +531,11 @@ message MergeMergeRequestResponse {
477	531		// merged_commit_id set to the new tip of the target branch and merge_mode
478	532		// set to the mode used.
479	533		MergeRequest merge_request = 1;
480		-	// SourceBranchDeleted is true when delete_source_branch was set and the
481		-	// branch is gone. It is false when the deletion failed after the merge (the
482		-	// branch moved in between, say): the merge stands and the branch is kept.
	534	+	// SourceBranchDeleted is true when delete_source_branch was set: the server
	535	+	// deletes the branch after answering. The deletion is skipped, and the
	536	+	// branch kept, if the branch moved or another open merge request uses it
	537	+	// by then; the merge stands either way. Watch reports the deletion with a
	538	+	// Pushed event for the source branch.
483	539		bool source_branch_deleted = 2;
484	540		}
485	541


@@ -44,6 +44,50 @@ enum Verdict {
44		VERDICT_CHANGES_REQUESTED = 2;	44		VERDICT_CHANGES_REQUESTED = 2;
45		}	45		}
46			46
			47	+	// MergeabilityState tells whether the head of an open merge request can be
			48	+	// merged into its target.
			49	+	enum MergeabilityState {
			50	+	// Not set.
			51	+	MERGEABILITY_STATE_UNSPECIFIED = 0;
			52	+	// The server has no result yet for the current tips of both branches. It
			53	+	// is replaced by another state when the check completes.
			54	+	MERGEABILITY_STATE_CHECKING = 1;
			55	+	// The target is an ancestor of the head: every mode can merge.
			56	+	MERGEABILITY_STATE_UP_TO_DATE = 2;
			57	+	// The target has commits the head lacks, but the head merges cleanly:
			58	+	// squash and merge commit can merge, fast-forward cannot.
			59	+	MERGEABILITY_STATE_BEHIND = 3;
			60	+	// The head does not merge cleanly into the target, or the branches share no
			61	+	// history: no mode can merge.
			62	+	MERGEABILITY_STATE_CONFLICT = 4;
			63	+	}
			64	+
			65	+	// Mergeability is the result of checking an open merge request against the
			66	+	// tips of its branches.
			67	+	message Mergeability {
			68	+	// State is the result.
			69	+	MergeabilityState state = 1;
			70	+	// TargetId is the commit the target branch pointed to when checked. Empty
			71	+	// while CHECKING.
			72	+	string target_id = 2;
			73	+	// HeadId is the commit the source branch pointed to when checked. Empty
			74	+	// while CHECKING.
			75	+	string head_id = 3;
			76	+	// Behind is the number of commits of the target that the head lacks. Set
			77	+	// only when state is BEHIND.
			78	+	int32 behind = 4;
			79	+	// BehindCapped says that Behind is a lower bound: the server stops counting
			80	+	// at 1,000.
			81	+	bool behind_capped = 5;
			82	+	// ConflictPaths are the paths that conflict, at most 20. Set only when
			83	+	// state is CONFLICT; empty when the branches share no history.
			84	+	repeated string conflict_paths = 6;
			85	+	// ConflictPathsTruncated says that more paths conflict than listed.
			86	+	bool conflict_paths_truncated = 7;
			87	+	// CheckedAt is when the server computed the result. Unset while CHECKING.
			88	+	google.protobuf.Timestamp checked_at = 8;
			89	+	}
			90	+
47		// MergeRequest asks to merge one branch of a repository into another branch	91		// MergeRequest asks to merge one branch of a repository into another branch
48		// of the same repository. It is about a branch, not about who wrote it.	92		// of the same repository. It is about a branch, not about who wrote it.
49		message MergeRequest {	93		message MergeRequest {

@@ -81,12 +125,19 @@ message MergeRequest {
81		// merged or closed it is the head at that moment.	125		// merged or closed it is the head at that moment.
82		string head_id = 11;	126		string head_id = 11;
83		// MergedCommitId is the id of the commit the target branch points to after	127		// MergedCommitId is the id of the commit the target branch points to after
84	-	// the merge: the head for a fast-forward, the new commit for a squash.	128	+	// the merge: the head for a fast-forward, the new commit for a squash or a
			129	+	// merge commit.
85		// Empty unless state is MERGED.	130		// Empty unless state is MERGED.
86		string merged_commit_id = 12;	131		string merged_commit_id = 12;
87		// MergeMode is how the merge request was merged. MERGE_MODE_UNSPECIFIED	132		// MergeMode is how the merge request was merged. MERGE_MODE_UNSPECIFIED
88		// unless state is MERGED.	133		// unless state is MERGED.
89		MergeMode merge_mode = 13;	134		MergeMode merge_mode = 13;
			135	+	// Mergeability tells whether the head can be merged into the target. Set
			136	+	// while the merge request is OPEN, with state CHECKING until the server has
			137	+	// a result for the current tips; never set once merged or closed. It is a
			138	+	// hint: MergeMergeRequest checks again. Set only by servers with the
			139	+	// "merge_requests.mergeability" feature.
			140	+	Mergeability mergeability = 14;
90		}	141		}
91			142
92		// Comment is a note on a merge request, either general or attached to a line	143		// Comment is a note on a merge request, either general or attached to a line

@@ -233,9 +284,12 @@ service MergeRequestService {
233		// never merged unseen. Fails with invalid_argument if head_id is empty or	284		// never merged unseen. Fails with invalid_argument if head_id is empty or
234		// not a commit id, and with failed_precondition if the merge request is not	285		// not a commit id, and with failed_precondition if the merge request is not
235		// open, if the source branch no longer points to head_id ("branch moved,	286		// open, if the source branch no longer points to head_id ("branch moved,
236	-	// read again"), if the target is not an ancestor of the head (rebase and	287	+	// read again"), if the mode is fast-forward and the target is not an
237	-	// push again), if the mode is not allowed by RepoSettings, or if a check	288	+	// ancestor of the head (rebase and push again, or merge with squash or
238	-	// fails and RepoSettings.failing_checks_block is set. Merges of one	289	+	// merge commit), if the mode is squash or merge commit and the head
			290	+	// conflicts with the target or shares no history with it (rebase and push
			291	+	// again), if the mode is not allowed by RepoSettings, or if a check fails
			292	+	// and RepoSettings.failing_checks_block is set. Merges of one
239		// repository run one at a time. Repeating a call that succeeded fails with	293		// repository run one at a time. Repeating a call that succeeded fails with
240		// failed_precondition (not open). On success the server publishes	294		// failed_precondition (not open). On success the server publishes
241		// MergeRequestMerged then Pushed for the target branch.	295		// MergeRequestMerged then Pushed for the target branch.

@@ -477,9 +531,11 @@ message MergeMergeRequestResponse {
477		// merged_commit_id set to the new tip of the target branch and merge_mode	531		// merged_commit_id set to the new tip of the target branch and merge_mode
478		// set to the mode used.	532		// set to the mode used.
479		MergeRequest merge_request = 1;	533		MergeRequest merge_request = 1;
480	-	// SourceBranchDeleted is true when delete_source_branch was set and the	534	+	// SourceBranchDeleted is true when delete_source_branch was set: the server
481	-	// branch is gone. It is false when the deletion failed after the merge (the	535	+	// deletes the branch after answering. The deletion is skipped, and the
482	-	// branch moved in between, say): the merge stands and the branch is kept.	536	+	// branch kept, if the branch moved or another open merge request uses it
			537	+	// by then; the merge stands either way. Watch reports the deletion with a
			538	+	// Pushed event for the source branch.
483		bool source_branch_deleted = 2;	539		bool source_branch_deleted = 2;
484		}	540		}
485			541

M proto/ermite/repo.proto +2 -2


@@ -37,8 +37,8 @@ enum IssuesMode {
37	37		message RepoSettings {
38	38		// AllowedMergeModes are the modes with which a merge request of the
39	39		// repository may be merged. It is never empty in a response and has no
40		-	// duplicate. Both MERGE_MODE_FAST_FORWARD and MERGE_MODE_SQUASH are allowed
41		-	// by default. MERGE_MODE_UNSPECIFIED is rejected.
	40	+	// duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is
	41	+	// rejected.
42	42		repeated MergeMode allowed_merge_modes = 1;
43	43		// FailingChecksBlock says whether a merge request whose checks fail cannot be
44	44		// merged. It is true at creation of the repository and always stored


@@ -37,8 +37,8 @@ enum IssuesMode {
37		message RepoSettings {	37		message RepoSettings {
38		// AllowedMergeModes are the modes with which a merge request of the	38		// AllowedMergeModes are the modes with which a merge request of the
39		// repository may be merged. It is never empty in a response and has no	39		// repository may be merged. It is never empty in a response and has no
40	-	// duplicate. Both MERGE_MODE_FAST_FORWARD and MERGE_MODE_SQUASH are allowed	40	+	// duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is
41	-	// by default. MERGE_MODE_UNSPECIFIED is rejected.	41	+	// rejected.
42		repeated MergeMode allowed_merge_modes = 1;	42		repeated MergeMode allowed_merge_modes = 1;
43		// FailingChecksBlock says whether a merge request whose checks fail cannot be	43		// FailingChecksBlock says whether a merge request whose checks fail cannot be
44		// merged. It is true at creation of the repository and always stored	44		// merged. It is true at creation of the repository and always stored

M proto/ermite/server.proto +5 -2


@@ -13,7 +13,7 @@ service ServerService {
13	13		// it first to check compatibility.
14	14		rpc GetVersion(GetVersionRequest) returns (GetVersionResponse);
15	15		// GetSigningKey returns the public key with which the server signs the
16		-	// commits it creates (squash merges, see MergeMode). It needs no
	16	+	// commits it creates (squash and merge commits, see MergeMode). It needs no
17	17		// authentication: the key is public, and anyone verifying a commit needs it.
18	18		// Servers that implement it list "signing_key" in
19	19		// GetVersionResponse.features.

@@ -57,7 +57,10 @@ message GetVersionResponse {
57	57		// secrets, vars, environment, permissions and trusted fields and Run.trusted),
58	58		// "ci.dispatch" (RunService.DispatchWorkflow), "ci.concurrency"
59	59		// (CI_STATUS_PENDING and RunJob.concurrency_group), "ci.cache" (Job.cache)
60		-	// and "ci.artifacts" (JobArtifactService and ArtifactService).
	60	+	// and "ci.artifacts" (JobArtifactService and ArtifactService). The merge
	61	+	// request identifier "merge_requests.mergeability" covers
	62	+	// MergeRequest.mergeability, the MergeRequestMergeability event and
	63	+	// MERGE_MODE_MERGE_COMMIT.
61	64		repeated string features = 2;
62	65		}
63	66

   // it first to check compatibility.
   rpc GetVersion(GetVersionRequest) returns (GetVersionResponse);
   // GetSigningKey returns the public key with which the server signs the
-  // commits it creates (squash merges, see MergeMode). It needs no
+  // commits it creates (squash and merge commits, see MergeMode). It needs no
   // authentication: the key is public, and anyone verifying a commit needs it.
   // Servers that implement it list "signing_key" in
   // GetVersionResponse.features.
   // secrets, vars, environment, permissions and trusted fields and Run.trusted),
   // "ci.dispatch" (RunService.DispatchWorkflow), "ci.concurrency"
   // (CI_STATUS_PENDING and RunJob.concurrency_group), "ci.cache" (Job.cache)
-  // and "ci.artifacts" (JobArtifactService and ArtifactService).
+  // and "ci.artifacts" (JobArtifactService and ArtifactService). The merge
+  // request identifier "merge_requests.mergeability" covers
+  // MergeRequest.mergeability, the MergeRequestMergeability event and
+  // MERGE_MODE_MERGE_COMMIT.
   repeated string features = 2;
 }

M proto/ermite/types.proto +15 -5


@@ -40,9 +40,11 @@ message Commit {
40	40		CommitVerification verification = 7;
41	41		}
42	42
43		-	// MergeMode is how a merge request is merged. Both modes need the target to
44		-	// be an ancestor of the head: a branch behind its target is rebased by its
45		-	// author and pushed again, the server never rebases nor creates merge commits.
	43	+	// MergeMode is how a merge request is merged. Fast-forward needs the target
	44	+	// to be an ancestor of the head. Squash and merge commit need the head to
	45	+	// merge cleanly into the target, which holds when the branch is behind its
	46	+	// target without conflict. The server never rebases: a branch that conflicts
	47	+	// is rebased by its author and pushed again.
46	48		enum MergeMode {
47	49		// Not set. In MergeMergeRequestRequest.mode it means fast-forward. Rejected
48	50		// in RepoSettings.allowed_merge_modes. Returned on a merge request that was

@@ -51,11 +53,19 @@ enum MergeMode {
51	53		// The target branch moves to the head. No commit is created and the
52	54		// signatures of the branch's commits are kept.
53	55		MERGE_MODE_FAST_FORWARD = 1;
54		-	// One new commit is created with the tree of the head and the target as
55		-	// only parent, signed by the server's key (see ServerService.GetSigningKey).
	56	+	// One new commit is created with the tree of the merge of the head into the
	57	+	// target (the tree of the head when the target is its ancestor) and the
	58	+	// target tip as only parent, signed by the server's key (see ServerService.GetSigningKey).
56	59		// Its author is the author of the first commit of the branch, the other
57	60		// authors are added as "Co-authored-by:" trailers, and its message is the
58	61		// title, " (!<number>)", a blank line and the list of the squashed commits'
59	62		// summaries.
60	63		MERGE_MODE_SQUASH = 2;
	64	+	// One new commit is created with two parents, the target tip then the head,
	65	+	// and the tree of the merge. It is signed by the server's key (see
	66	+	// ServerService.GetSigningKey); its author and committer are the server
	67	+	// identity. Its message is "Merge branch '<source>' into <target> (!<n>)",
	68	+	// a blank line and the title. The signatures of the branch's commits are
	69	+	// kept. Needs the "merge_requests.mergeability" feature.
	70	+	MERGE_MODE_MERGE_COMMIT = 3;
61	71		}

   CommitVerification verification = 7;
 }
-// MergeMode is how a merge request is merged. Both modes need the target to
+// MergeMode is how a merge request is merged. Fast-forward needs the target
-// be an ancestor of the head: a branch behind its target is rebased by its
+// to be an ancestor of the head. Squash and merge commit need the head to
-// author and pushed again, the server never rebases nor creates merge commits.
+// merge cleanly into the target, which holds when the branch is behind its
+// target without conflict. The server never rebases: a branch that conflicts
+// is rebased by its author and pushed again.
 enum MergeMode {
   // Not set. In MergeMergeRequestRequest.mode it means fast-forward. Rejected
   // in RepoSettings.allowed_merge_modes. Returned on a merge request that was
   // The target branch moves to the head. No commit is created and the
   // signatures of the branch's commits are kept.
   MERGE_MODE_FAST_FORWARD = 1;
-  // One new commit is created with the tree of the head and the target as
+  // One new commit is created with the tree of the merge of the head into the
-  // only parent, signed by the server's key (see ServerService.GetSigningKey).
+  // target (the tree of the head when the target is its ancestor) and the
+  // target tip as only parent, signed by the server's key (see ServerService.GetSigningKey).
   // Its author is the author of the first commit of the branch, the other
   // authors are added as "Co-authored-by:" trailers, and its message is the
   // title, " (!<number>)", a blank line and the list of the squashed commits'
   // summaries.
   MERGE_MODE_SQUASH = 2;
+  // One new commit is created with two parents, the target tip then the head,
+  // and the tree of the merge. It is signed by the server's key (see
+  // ServerService.GetSigningKey); its author and committer are the server
+  // identity. Its message is "Merge branch '<source>' into <target> (!<n>)",
+  // a blank line and the title. The signatures of the branch's commits are
+  // kept. Needs the "merge_requests.mergeability" feature.
+  MERGE_MODE_MERGE_COMMIT = 3;
 }


@@ -5,10 +5,10 @@
5	5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|
6	6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|
7	7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|
8		-	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest`, `MarkRead` \|
	8	+	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest` (modes fast-forward, squash, merge commit), `MarkRead`. Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` when it changes (feature `merge_requests.mergeability`) \|
9	9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|
10	10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|
11		-	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content) \|
	11	+	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content). Event 22: `merge_request_mergeability` \|
12	12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|
13	13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|
14	14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|


@@ -5,10 +5,10 @@
5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|	5		\| `RepoService` \| `ListRepos`, `GetRepo`, `CreateRepo`, `UpdateRepo` (field mask, merge settings), `DeleteRepo` \|
6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|	6		\| `GitService` \| `ListRefs`, `GetTree`, `ListPaths`, `GetBlob` (streamed), `ListCommits`, `GetCommit` (structured diff), `ResolveRevision` \|
7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|	7		\| `TokenService` \| `CreateToken` (secret shown once), `ListTokens`, `RevokeToken` \|
8	-	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest`, `MarkRead` \|	8	+	\| `MergeRequestService` \| `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MergeMergeRequest` (modes fast-forward, squash, merge commit), `MarkRead`. Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` when it changes (feature `merge_requests.mergeability`) \|
9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|	9		\| `IssueService` \| `CreateIssue`, `ListIssues`, `GetIssue` (comments), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Feature `issues`. Issues share numbers with merge requests \|
10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|	10		\| `SessionService` \| `CreateLoginLink`, `SignOutEverywhere` (owner only) \|
11	-	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content) \|	11	+	\| `EventService` \| `Watch` (streamed, resumable). Topics `home`, `repo:<name>` and `owner` (owner rights only). Events 17–21: `issue_opened`, `issue_closed`, `issue_reopened`, `issue_commented`, and `issue_submitted` (only on `owner`, no content). Event 22: `merge_request_mergeability` \|
12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|	12		\| `ServerService` \| `GetVersion` (version and features), `GetSigningKey`, `RotateOIDCKey` (owner only) \|
13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|	13		\| `TrustedKeyService` \| `ListTrustedKeys`, `AddTrustedKey` and `RemoveTrustedKey` (owner only). `Commit.verification` carries the result of the check (feature `commit_signatures`) \|
14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|	14		\| `RunService` \| `ListRuns`, `GetRun`, `GetJob`, `GetJobLog` (streamed, follow), `ListAnnotations`, `GetStepSummaries`, `CancelRun`, `RerunRun`, `DispatchWorkflow`, `ListWorkflows`, `DisableWorkflow`, `EnableWorkflow`, `ListChecks`, `ListRunners`, `RemoveRunner` \|

Merge settings

Comments0 open / 0

Commit	Subject	Author	Date	Signature
6d3fb04	docs(proto): a squash commit takes the tree of the merge into the target	brice	3d ago	GPG Verified
5404729	docs(proto): the source branch is deleted after the merge answer	brice	3d ago	GPG Verified
788238f	docs(proto): allow every merge mode by default	brice	3d ago	GPG Verified
c671ff4	feat(proto): merge request mergeability, its Watch event and the merge commit mode	brice	3d ago	GPG Verified