Merge d1c609e1c109abef55c26edd9485ad65479e0da1 into c54bf5d54556da10c4c6b649f770b5c5e8cf194e
9 files · +339 -144
M docs/services.md +1 -1
| @@ -5,7 +5,7 @@ | |||
| 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` (modes fast-forward, squash, merge commit), `MarkRead`, `EnableAutoMerge`, `CancelAutoMerge` (merge by itself once a check passed on the head and all its runs are complete; setting `allow_auto_merge`, `MergeRequest.auto_merge`, events `MergeRequestAutoMergeEnabled` and `MergeRequestAutoMergeCancelled`, `MergeRequestMerged.auto`; feature `merge_requests.auto_merge`). Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` each time a result is settled for new branch tips (feature `merge_requests.mergeability`) | | |
| 8 | + | | `MergeRequestService` | `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MarkReady`, `MergeMergeRequest` (modes fast-forward, squash, merge commit), `MarkRead`, `EnableAutoMerge`, `CancelAutoMerge` (merge by itself once a check passed on the head and all its runs are complete; setting `allow_auto_merge`, `MergeRequest.auto_merge`, events `MergeRequestAutoMergeEnabled` and `MergeRequestAutoMergeCancelled`, `MergeRequestMerged.auto`; feature `merge_requests.auto_merge`). Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` each time a result is settled for new branch tips (feature `merge_requests.mergeability`) | | |
| 9 | 9 | | `IssueService` | `CreateIssue`, `ListIssues`, `GetIssue` (comments, merge requests naming the issue, `closed_by_merge_request`), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Features `issues`, `issues.links`. Issues share numbers with merge requests | | |
| 10 | 10 | | `SessionService` | `CreateLoginLink`, `SignOutEverywhere` (owner only) | | |
| 11 | 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` | | |
| @@ -5,7 +5,7 @@ | |||||
| 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` (modes fast-forward, squash, merge commit), `MarkRead`, `EnableAutoMerge`, `CancelAutoMerge` (merge by itself once a check passed on the head and all its runs are complete; setting `allow_auto_merge`, `MergeRequest.auto_merge`, events `MergeRequestAutoMergeEnabled` and `MergeRequestAutoMergeCancelled`, `MergeRequestMerged.auto`; feature `merge_requests.auto_merge`). Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` each time a result is settled for new branch tips (feature `merge_requests.mergeability`) | | 8 | + | | `MergeRequestService` | `CreateMergeRequest`, `ListMergeRequests`, `GetMergeRequest` (commits, diff, comments), `AddComment`, `EditComment`, `DeleteComment`, `ResolveComment`, `CloseMergeRequest`, `MarkReady`, `MergeMergeRequest` (modes fast-forward, squash, merge commit), `MarkRead`, `EnableAutoMerge`, `CancelAutoMerge` (merge by itself once a check passed on the head and all its runs are complete; setting `allow_auto_merge`, `MergeRequest.auto_merge`, events `MergeRequestAutoMergeEnabled` and `MergeRequestAutoMergeCancelled`, `MergeRequestMerged.auto`; feature `merge_requests.auto_merge`). Open merge requests carry `mergeability` (up to date, behind, conflict, or checking) and `Watch` publishes `MergeRequestMergeability` each time a result is settled for new branch tips (feature `merge_requests.mergeability`) | |
| 9 | | `IssueService` | `CreateIssue`, `ListIssues`, `GetIssue` (comments, merge requests naming the issue, `closed_by_merge_request`), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Features `issues`, `issues.links`. Issues share numbers with merge requests | | 9 | | `IssueService` | `CreateIssue`, `ListIssues`, `GetIssue` (comments, merge requests naming the issue, `closed_by_merge_request`), `AddIssueComment`, `CloseIssue`, `ReopenIssue`; owner only: `ListPendingIssues`, `ApproveIssue`, `RejectIssue`. Features `issues`, `issues.links`. 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). Event 22: `merge_request_mergeability` | | 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` | | ||
M gen/ermite/ermiteconnect/merge_request.connect.go +57 -12
| @@ -59,6 +59,9 @@ const ( | |||
| 59 | 59 | // MergeRequestServiceCloseMergeRequestProcedure is the fully-qualified name of the | |
| 60 | 60 | // MergeRequestService's CloseMergeRequest RPC. | |
| 61 | 61 | MergeRequestServiceCloseMergeRequestProcedure = "/ermite.MergeRequestService/CloseMergeRequest" | |
| 62 | + | // MergeRequestServiceMarkReadyProcedure is the fully-qualified name of the MergeRequestService's | |
| 63 | + | // MarkReady RPC. | |
| 64 | + | MergeRequestServiceMarkReadyProcedure = "/ermite.MergeRequestService/MarkReady" | |
| 62 | 65 | // MergeRequestServiceMergeMergeRequestProcedure is the fully-qualified name of the | |
| 63 | 66 | // MergeRequestService's MergeMergeRequest RPC. | |
| 64 | 67 | MergeRequestServiceMergeMergeRequestProcedure = "/ermite.MergeRequestService/MergeMergeRequest" | |
| @@ -127,7 +130,16 @@ type MergeRequestServiceClient interface { | |||
| 127 | 130 | // the mr:write scope. Fails with failed_precondition if the merge request | |
| 128 | 131 | // is not open. A closed merge request cannot be reopened: open a new one. | |
| 129 | 132 | CloseMergeRequest(context.Context, *connect.Request[ermite.CloseMergeRequestRequest]) (*connect.Response[ermite.CloseMergeRequestResponse], error) | |
| 130 | - | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope. | |
| 133 | + | // MarkReady removes the draft prefix ("WIP:" or "[WIP]") from the title so | |
| 134 | + | // the merge request can be merged. Needs the mr:write scope. Fails with | |
| 135 | + | // failed_precondition if the merge request is not open or is not a draft. | |
| 136 | + | // Publishes no event: there is none for a change of title. Needs the | |
| 137 | + | // "merge_requests.ready" feature. | |
| 138 | + | MarkReady(context.Context, *connect.Request[ermite.MarkReadyRequest]) (*connect.Response[ermite.MarkReadyResponse], error) | |
| 139 | + | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope, | |
| 140 | + | // which merges only when the checks on the head allow it: none failed and | |
| 141 | + | // none queued or running (a head with no checks may be merged; success, | |
| 142 | + | // skipped and neutral pass). The mr:force-merge scope allows ignore_checks. | |
| 131 | 143 | // The caller passes the head it reviewed: the server merges only if the | |
| 132 | 144 | // source branch still points to it, so a push between review and merge is | |
| 133 | 145 | // never merged unseen. Fails with invalid_argument if head_id is empty or | |
| @@ -137,17 +149,17 @@ type MergeRequestServiceClient interface { | |||
| 137 | 149 | // ancestor of the head (rebase and push again, or merge with squash or | |
| 138 | 150 | // merge commit), if the mode is squash or merge commit and the head | |
| 139 | 151 | // conflicts with the target or shares no history with it (rebase and push | |
| 140 | - | // again), if the mode is not allowed by RepoSettings, or if a check fails | |
| 141 | - | // and RepoSettings.failing_checks_block is set. Merges of one | |
| 152 | + | // again), if the mode is not allowed by RepoSettings, or if a check failed or | |
| 153 | + | // has not finished, unless ignore_checks is set. Merges of one | |
| 142 | 154 | // repository run one at a time. Repeating a call that succeeded fails with | |
| 143 | 155 | // failed_precondition (not open). On success the server publishes | |
| 144 | 156 | // MergeRequestMerged then Pushed for the target branch. | |
| 145 | 157 | MergeMergeRequest(context.Context, *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) | |
| 146 | 158 | // EnableAutoMerge asks the server to merge an open merge request by itself | |
| 147 | 159 | // once at least one check passed on its head, every run created on that head | |
| 148 | - | // is complete, and the merge would be accepted whatever | |
| 149 | - | // RepoSettings.failing_checks_block says. Needs the mr:merge scope and, for a | |
| 150 | - | // token limited to branches, write access to the target branch | |
| 160 | + | // is complete, and no check failed. It does not take ignore_checks. Needs | |
| 161 | + | // the mr:merge scope and, for a token limited to branches, write access to | |
| 162 | + | // the target branch | |
| 151 | 163 | // (permission_denied otherwise). The server records the caller, the mode and | |
| 152 | 164 | // the head the caller saw; it merges as the caller, after resolving the caller | |
| 153 | 165 | // again, and cancels the auto-merge if the caller can no longer merge, if the | |
| @@ -232,6 +244,12 @@ func NewMergeRequestServiceClient(httpClient connect.HTTPClient, baseURL string, | |||
| 232 | 244 | connect.WithSchema(mergeRequestServiceMethods.ByName("CloseMergeRequest")), | |
| 233 | 245 | connect.WithClientOptions(opts...), | |
| 234 | 246 | ), | |
| 247 | + | markReady: connect.NewClient[ermite.MarkReadyRequest, ermite.MarkReadyResponse]( | |
| 248 | + | httpClient, | |
| 249 | + | baseURL+MergeRequestServiceMarkReadyProcedure, | |
| 250 | + | connect.WithSchema(mergeRequestServiceMethods.ByName("MarkReady")), | |
| 251 | + | connect.WithClientOptions(opts...), | |
| 252 | + | ), | |
| 235 | 253 | mergeMergeRequest: connect.NewClient[ermite.MergeMergeRequestRequest, ermite.MergeMergeRequestResponse]( | |
| 236 | 254 | httpClient, | |
| 237 | 255 | baseURL+MergeRequestServiceMergeMergeRequestProcedure, | |
| @@ -269,6 +287,7 @@ type mergeRequestServiceClient struct { | |||
| 269 | 287 | deleteComment *connect.Client[ermite.DeleteCommentRequest, ermite.DeleteCommentResponse] | |
| 270 | 288 | resolveComment *connect.Client[ermite.ResolveCommentRequest, ermite.ResolveCommentResponse] | |
| 271 | 289 | closeMergeRequest *connect.Client[ermite.CloseMergeRequestRequest, ermite.CloseMergeRequestResponse] | |
| 290 | + | markReady *connect.Client[ermite.MarkReadyRequest, ermite.MarkReadyResponse] | |
| 272 | 291 | mergeMergeRequest *connect.Client[ermite.MergeMergeRequestRequest, ermite.MergeMergeRequestResponse] | |
| 273 | 292 | enableAutoMerge *connect.Client[ermite.EnableAutoMergeRequest, ermite.EnableAutoMergeResponse] | |
| 274 | 293 | cancelAutoMerge *connect.Client[ermite.CancelAutoMergeRequest, ermite.CancelAutoMergeResponse] | |
| @@ -315,6 +334,11 @@ func (c *mergeRequestServiceClient) CloseMergeRequest(ctx context.Context, req * | |||
| 315 | 334 | return c.closeMergeRequest.CallUnary(ctx, req) | |
| 316 | 335 | } | |
| 317 | 336 | ||
| 337 | + | // MarkReady calls ermite.MergeRequestService.MarkReady. | |
| 338 | + | func (c *mergeRequestServiceClient) MarkReady(ctx context.Context, req *connect.Request[ermite.MarkReadyRequest]) (*connect.Response[ermite.MarkReadyResponse], error) { | |
| 339 | + | return c.markReady.CallUnary(ctx, req) | |
| 340 | + | } | |
| 341 | + | ||
| 318 | 342 | // MergeMergeRequest calls ermite.MergeRequestService.MergeMergeRequest. | |
| 319 | 343 | func (c *mergeRequestServiceClient) MergeMergeRequest(ctx context.Context, req *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) { | |
| 320 | 344 | return c.mergeMergeRequest.CallUnary(ctx, req) | |
| @@ -389,7 +413,16 @@ type MergeRequestServiceHandler interface { | |||
| 389 | 413 | // the mr:write scope. Fails with failed_precondition if the merge request | |
| 390 | 414 | // is not open. A closed merge request cannot be reopened: open a new one. | |
| 391 | 415 | CloseMergeRequest(context.Context, *connect.Request[ermite.CloseMergeRequestRequest]) (*connect.Response[ermite.CloseMergeRequestResponse], error) | |
| 392 | - | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope. | |
| 416 | + | // MarkReady removes the draft prefix ("WIP:" or "[WIP]") from the title so | |
| 417 | + | // the merge request can be merged. Needs the mr:write scope. Fails with | |
| 418 | + | // failed_precondition if the merge request is not open or is not a draft. | |
| 419 | + | // Publishes no event: there is none for a change of title. Needs the | |
| 420 | + | // "merge_requests.ready" feature. | |
| 421 | + | MarkReady(context.Context, *connect.Request[ermite.MarkReadyRequest]) (*connect.Response[ermite.MarkReadyResponse], error) | |
| 422 | + | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope, | |
| 423 | + | // which merges only when the checks on the head allow it: none failed and | |
| 424 | + | // none queued or running (a head with no checks may be merged; success, | |
| 425 | + | // skipped and neutral pass). The mr:force-merge scope allows ignore_checks. | |
| 393 | 426 | // The caller passes the head it reviewed: the server merges only if the | |
| 394 | 427 | // source branch still points to it, so a push between review and merge is | |
| 395 | 428 | // never merged unseen. Fails with invalid_argument if head_id is empty or | |
| @@ -399,17 +432,17 @@ type MergeRequestServiceHandler interface { | |||
| 399 | 432 | // ancestor of the head (rebase and push again, or merge with squash or | |
| 400 | 433 | // merge commit), if the mode is squash or merge commit and the head | |
| 401 | 434 | // conflicts with the target or shares no history with it (rebase and push | |
| 402 | - | // again), if the mode is not allowed by RepoSettings, or if a check fails | |
| 403 | - | // and RepoSettings.failing_checks_block is set. Merges of one | |
| 435 | + | // again), if the mode is not allowed by RepoSettings, or if a check failed or | |
| 436 | + | // has not finished, unless ignore_checks is set. Merges of one | |
| 404 | 437 | // repository run one at a time. Repeating a call that succeeded fails with | |
| 405 | 438 | // failed_precondition (not open). On success the server publishes | |
| 406 | 439 | // MergeRequestMerged then Pushed for the target branch. | |
| 407 | 440 | MergeMergeRequest(context.Context, *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) | |
| 408 | 441 | // EnableAutoMerge asks the server to merge an open merge request by itself | |
| 409 | 442 | // once at least one check passed on its head, every run created on that head | |
| 410 | - | // is complete, and the merge would be accepted whatever | |
| 411 | - | // RepoSettings.failing_checks_block says. Needs the mr:merge scope and, for a | |
| 412 | - | // token limited to branches, write access to the target branch | |
| 443 | + | // is complete, and no check failed. It does not take ignore_checks. Needs | |
| 444 | + | // the mr:merge scope and, for a token limited to branches, write access to | |
| 445 | + | // the target branch | |
| 413 | 446 | // (permission_denied otherwise). The server records the caller, the mode and | |
| 414 | 447 | // the head the caller saw; it merges as the caller, after resolving the caller | |
| 415 | 448 | // again, and cancels the auto-merge if the caller can no longer merge, if the | |
| @@ -490,6 +523,12 @@ func NewMergeRequestServiceHandler(svc MergeRequestServiceHandler, opts ...conne | |||
| 490 | 523 | connect.WithSchema(mergeRequestServiceMethods.ByName("CloseMergeRequest")), | |
| 491 | 524 | connect.WithHandlerOptions(opts...), | |
| 492 | 525 | ) | |
| 526 | + | mergeRequestServiceMarkReadyHandler := connect.NewUnaryHandler( | |
| 527 | + | MergeRequestServiceMarkReadyProcedure, | |
| 528 | + | svc.MarkReady, | |
| 529 | + | connect.WithSchema(mergeRequestServiceMethods.ByName("MarkReady")), | |
| 530 | + | connect.WithHandlerOptions(opts...), | |
| 531 | + | ) | |
| 493 | 532 | mergeRequestServiceMergeMergeRequestHandler := connect.NewUnaryHandler( | |
| 494 | 533 | MergeRequestServiceMergeMergeRequestProcedure, | |
| 495 | 534 | svc.MergeMergeRequest, | |
| @@ -532,6 +571,8 @@ func NewMergeRequestServiceHandler(svc MergeRequestServiceHandler, opts ...conne | |||
| 532 | 571 | mergeRequestServiceResolveCommentHandler.ServeHTTP(w, r) | |
| 533 | 572 | case MergeRequestServiceCloseMergeRequestProcedure: | |
| 534 | 573 | mergeRequestServiceCloseMergeRequestHandler.ServeHTTP(w, r) | |
| 574 | + | case MergeRequestServiceMarkReadyProcedure: | |
| 575 | + | mergeRequestServiceMarkReadyHandler.ServeHTTP(w, r) | |
| 535 | 576 | case MergeRequestServiceMergeMergeRequestProcedure: | |
| 536 | 577 | mergeRequestServiceMergeMergeRequestHandler.ServeHTTP(w, r) | |
| 537 | 578 | case MergeRequestServiceEnableAutoMergeProcedure: | |
| @@ -581,6 +622,10 @@ func (UnimplementedMergeRequestServiceHandler) CloseMergeRequest(context.Context | |||
| 581 | 622 | return nil, connect.NewError(connect.CodeUnimplemented, errors.New("ermite.MergeRequestService.CloseMergeRequest is not implemented")) | |
| 582 | 623 | } | |
| 583 | 624 | ||
| 625 | + | func (UnimplementedMergeRequestServiceHandler) MarkReady(context.Context, *connect.Request[ermite.MarkReadyRequest]) (*connect.Response[ermite.MarkReadyResponse], error) { | |
| 626 | + | return nil, connect.NewError(connect.CodeUnimplemented, errors.New("ermite.MergeRequestService.MarkReady is not implemented")) | |
| 627 | + | } | |
| 628 | + | ||
| 584 | 629 | func (UnimplementedMergeRequestServiceHandler) MergeMergeRequest(context.Context, *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) { | |
| 585 | 630 | return nil, connect.NewError(connect.CodeUnimplemented, errors.New("ermite.MergeRequestService.MergeMergeRequest is not implemented")) | |
| 586 | 631 | } | |
| @@ -59,6 +59,9 @@ const ( | |||||
| 59 | // MergeRequestServiceCloseMergeRequestProcedure is the fully-qualified name of the | 59 | // MergeRequestServiceCloseMergeRequestProcedure is the fully-qualified name of the | ||
| 60 | // MergeRequestService's CloseMergeRequest RPC. | 60 | // MergeRequestService's CloseMergeRequest RPC. | ||
| 61 | MergeRequestServiceCloseMergeRequestProcedure = "/ermite.MergeRequestService/CloseMergeRequest" | 61 | MergeRequestServiceCloseMergeRequestProcedure = "/ermite.MergeRequestService/CloseMergeRequest" | ||
| 62 | + | // MergeRequestServiceMarkReadyProcedure is the fully-qualified name of the MergeRequestService's | |||
| 63 | + | // MarkReady RPC. | |||
| 64 | + | MergeRequestServiceMarkReadyProcedure = "/ermite.MergeRequestService/MarkReady" | |||
| 62 | // MergeRequestServiceMergeMergeRequestProcedure is the fully-qualified name of the | 65 | // MergeRequestServiceMergeMergeRequestProcedure is the fully-qualified name of the | ||
| 63 | // MergeRequestService's MergeMergeRequest RPC. | 66 | // MergeRequestService's MergeMergeRequest RPC. | ||
| 64 | MergeRequestServiceMergeMergeRequestProcedure = "/ermite.MergeRequestService/MergeMergeRequest" | 67 | MergeRequestServiceMergeMergeRequestProcedure = "/ermite.MergeRequestService/MergeMergeRequest" | ||
| @@ -127,7 +130,16 @@ type MergeRequestServiceClient interface { | |||||
| 127 | // the mr:write scope. Fails with failed_precondition if the merge request | 130 | // the mr:write scope. Fails with failed_precondition if the merge request | ||
| 128 | // is not open. A closed merge request cannot be reopened: open a new one. | 131 | // is not open. A closed merge request cannot be reopened: open a new one. | ||
| 129 | CloseMergeRequest(context.Context, *connect.Request[ermite.CloseMergeRequestRequest]) (*connect.Response[ermite.CloseMergeRequestResponse], error) | 132 | CloseMergeRequest(context.Context, *connect.Request[ermite.CloseMergeRequestRequest]) (*connect.Response[ermite.CloseMergeRequestResponse], error) | ||
| 130 | - | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope. | 133 | + | // MarkReady removes the draft prefix ("WIP:" or "[WIP]") from the title so |
| 134 | + | // the merge request can be merged. Needs the mr:write scope. Fails with | |||
| 135 | + | // failed_precondition if the merge request is not open or is not a draft. | |||
| 136 | + | // Publishes no event: there is none for a change of title. Needs the | |||
| 137 | + | // "merge_requests.ready" feature. | |||
| 138 | + | MarkReady(context.Context, *connect.Request[ermite.MarkReadyRequest]) (*connect.Response[ermite.MarkReadyResponse], error) | |||
| 139 | + | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope, | |||
| 140 | + | // which merges only when the checks on the head allow it: none failed and | |||
| 141 | + | // none queued or running (a head with no checks may be merged; success, | |||
| 142 | + | // skipped and neutral pass). The mr:force-merge scope allows ignore_checks. | |||
| 131 | // The caller passes the head it reviewed: the server merges only if the | 143 | // The caller passes the head it reviewed: the server merges only if the | ||
| 132 | // source branch still points to it, so a push between review and merge is | 144 | // source branch still points to it, so a push between review and merge is | ||
| 133 | // never merged unseen. Fails with invalid_argument if head_id is empty or | 145 | // never merged unseen. Fails with invalid_argument if head_id is empty or | ||
| @@ -137,17 +149,17 @@ type MergeRequestServiceClient interface { | |||||
| 137 | // ancestor of the head (rebase and push again, or merge with squash or | 149 | // ancestor of the head (rebase and push again, or merge with squash or | ||
| 138 | // merge commit), if the mode is squash or merge commit and the head | 150 | // merge commit), if the mode is squash or merge commit and the head | ||
| 139 | // conflicts with the target or shares no history with it (rebase and push | 151 | // conflicts with the target or shares no history with it (rebase and push | ||
| 140 | - | // again), if the mode is not allowed by RepoSettings, or if a check fails | 152 | + | // again), if the mode is not allowed by RepoSettings, or if a check failed or |
| 141 | - | // and RepoSettings.failing_checks_block is set. Merges of one | 153 | + | // has not finished, unless ignore_checks is set. Merges of one |
| 142 | // repository run one at a time. Repeating a call that succeeded fails with | 154 | // repository run one at a time. Repeating a call that succeeded fails with | ||
| 143 | // failed_precondition (not open). On success the server publishes | 155 | // failed_precondition (not open). On success the server publishes | ||
| 144 | // MergeRequestMerged then Pushed for the target branch. | 156 | // MergeRequestMerged then Pushed for the target branch. | ||
| 145 | MergeMergeRequest(context.Context, *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) | 157 | MergeMergeRequest(context.Context, *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) | ||
| 146 | // EnableAutoMerge asks the server to merge an open merge request by itself | 158 | // EnableAutoMerge asks the server to merge an open merge request by itself | ||
| 147 | // once at least one check passed on its head, every run created on that head | 159 | // once at least one check passed on its head, every run created on that head | ||
| 148 | - | // is complete, and the merge would be accepted whatever | 160 | + | // is complete, and no check failed. It does not take ignore_checks. Needs |
| 149 | - | // RepoSettings.failing_checks_block says. Needs the mr:merge scope and, for a | 161 | + | // the mr:merge scope and, for a token limited to branches, write access to |
| 150 | - | // token limited to branches, write access to the target branch | 162 | + | // the target branch |
| 151 | // (permission_denied otherwise). The server records the caller, the mode and | 163 | // (permission_denied otherwise). The server records the caller, the mode and | ||
| 152 | // the head the caller saw; it merges as the caller, after resolving the caller | 164 | // the head the caller saw; it merges as the caller, after resolving the caller | ||
| 153 | // again, and cancels the auto-merge if the caller can no longer merge, if the | 165 | // again, and cancels the auto-merge if the caller can no longer merge, if the | ||
| @@ -232,6 +244,12 @@ func NewMergeRequestServiceClient(httpClient connect.HTTPClient, baseURL string, | |||||
| 232 | connect.WithSchema(mergeRequestServiceMethods.ByName("CloseMergeRequest")), | 244 | connect.WithSchema(mergeRequestServiceMethods.ByName("CloseMergeRequest")), | ||
| 233 | connect.WithClientOptions(opts...), | 245 | connect.WithClientOptions(opts...), | ||
| 234 | ), | 246 | ), | ||
| 247 | + | markReady: connect.NewClient[ermite.MarkReadyRequest, ermite.MarkReadyResponse]( | |||
| 248 | + | httpClient, | |||
| 249 | + | baseURL+MergeRequestServiceMarkReadyProcedure, | |||
| 250 | + | connect.WithSchema(mergeRequestServiceMethods.ByName("MarkReady")), | |||
| 251 | + | connect.WithClientOptions(opts...), | |||
| 252 | + | ), | |||
| 235 | mergeMergeRequest: connect.NewClient[ermite.MergeMergeRequestRequest, ermite.MergeMergeRequestResponse]( | 253 | mergeMergeRequest: connect.NewClient[ermite.MergeMergeRequestRequest, ermite.MergeMergeRequestResponse]( | ||
| 236 | httpClient, | 254 | httpClient, | ||
| 237 | baseURL+MergeRequestServiceMergeMergeRequestProcedure, | 255 | baseURL+MergeRequestServiceMergeMergeRequestProcedure, | ||
| @@ -269,6 +287,7 @@ type mergeRequestServiceClient struct { | |||||
| 269 | deleteComment *connect.Client[ermite.DeleteCommentRequest, ermite.DeleteCommentResponse] | 287 | deleteComment *connect.Client[ermite.DeleteCommentRequest, ermite.DeleteCommentResponse] | ||
| 270 | resolveComment *connect.Client[ermite.ResolveCommentRequest, ermite.ResolveCommentResponse] | 288 | resolveComment *connect.Client[ermite.ResolveCommentRequest, ermite.ResolveCommentResponse] | ||
| 271 | closeMergeRequest *connect.Client[ermite.CloseMergeRequestRequest, ermite.CloseMergeRequestResponse] | 289 | closeMergeRequest *connect.Client[ermite.CloseMergeRequestRequest, ermite.CloseMergeRequestResponse] | ||
| 290 | + | markReady *connect.Client[ermite.MarkReadyRequest, ermite.MarkReadyResponse] | |||
| 272 | mergeMergeRequest *connect.Client[ermite.MergeMergeRequestRequest, ermite.MergeMergeRequestResponse] | 291 | mergeMergeRequest *connect.Client[ermite.MergeMergeRequestRequest, ermite.MergeMergeRequestResponse] | ||
| 273 | enableAutoMerge *connect.Client[ermite.EnableAutoMergeRequest, ermite.EnableAutoMergeResponse] | 292 | enableAutoMerge *connect.Client[ermite.EnableAutoMergeRequest, ermite.EnableAutoMergeResponse] | ||
| 274 | cancelAutoMerge *connect.Client[ermite.CancelAutoMergeRequest, ermite.CancelAutoMergeResponse] | 293 | cancelAutoMerge *connect.Client[ermite.CancelAutoMergeRequest, ermite.CancelAutoMergeResponse] | ||
| @@ -315,6 +334,11 @@ func (c *mergeRequestServiceClient) CloseMergeRequest(ctx context.Context, req * | |||||
| 315 | return c.closeMergeRequest.CallUnary(ctx, req) | 334 | return c.closeMergeRequest.CallUnary(ctx, req) | ||
| 316 | } | 335 | } | ||
| 317 | 336 | ||||
| 337 | + | // MarkReady calls ermite.MergeRequestService.MarkReady. | |||
| 338 | + | func (c *mergeRequestServiceClient) MarkReady(ctx context.Context, req *connect.Request[ermite.MarkReadyRequest]) (*connect.Response[ermite.MarkReadyResponse], error) { | |||
| 339 | + | return c.markReady.CallUnary(ctx, req) | |||
| 340 | + | } | |||
| 341 | + | ||||
| 318 | // MergeMergeRequest calls ermite.MergeRequestService.MergeMergeRequest. | 342 | // MergeMergeRequest calls ermite.MergeRequestService.MergeMergeRequest. | ||
| 319 | func (c *mergeRequestServiceClient) MergeMergeRequest(ctx context.Context, req *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) { | 343 | func (c *mergeRequestServiceClient) MergeMergeRequest(ctx context.Context, req *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) { | ||
| 320 | return c.mergeMergeRequest.CallUnary(ctx, req) | 344 | return c.mergeMergeRequest.CallUnary(ctx, req) | ||
| @@ -389,7 +413,16 @@ type MergeRequestServiceHandler interface { | |||||
| 389 | // the mr:write scope. Fails with failed_precondition if the merge request | 413 | // the mr:write scope. Fails with failed_precondition if the merge request | ||
| 390 | // is not open. A closed merge request cannot be reopened: open a new one. | 414 | // is not open. A closed merge request cannot be reopened: open a new one. | ||
| 391 | CloseMergeRequest(context.Context, *connect.Request[ermite.CloseMergeRequestRequest]) (*connect.Response[ermite.CloseMergeRequestResponse], error) | 415 | CloseMergeRequest(context.Context, *connect.Request[ermite.CloseMergeRequestRequest]) (*connect.Response[ermite.CloseMergeRequestResponse], error) | ||
| 392 | - | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope. | 416 | + | // MarkReady removes the draft prefix ("WIP:" or "[WIP]") from the title so |
| 417 | + | // the merge request can be merged. Needs the mr:write scope. Fails with | |||
| 418 | + | // failed_precondition if the merge request is not open or is not a draft. | |||
| 419 | + | // Publishes no event: there is none for a change of title. Needs the | |||
| 420 | + | // "merge_requests.ready" feature. | |||
| 421 | + | MarkReady(context.Context, *connect.Request[ermite.MarkReadyRequest]) (*connect.Response[ermite.MarkReadyResponse], error) | |||
| 422 | + | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope, | |||
| 423 | + | // which merges only when the checks on the head allow it: none failed and | |||
| 424 | + | // none queued or running (a head with no checks may be merged; success, | |||
| 425 | + | // skipped and neutral pass). The mr:force-merge scope allows ignore_checks. | |||
| 393 | // The caller passes the head it reviewed: the server merges only if the | 426 | // The caller passes the head it reviewed: the server merges only if the | ||
| 394 | // source branch still points to it, so a push between review and merge is | 427 | // source branch still points to it, so a push between review and merge is | ||
| 395 | // never merged unseen. Fails with invalid_argument if head_id is empty or | 428 | // never merged unseen. Fails with invalid_argument if head_id is empty or | ||
| @@ -399,17 +432,17 @@ type MergeRequestServiceHandler interface { | |||||
| 399 | // ancestor of the head (rebase and push again, or merge with squash or | 432 | // ancestor of the head (rebase and push again, or merge with squash or | ||
| 400 | // merge commit), if the mode is squash or merge commit and the head | 433 | // merge commit), if the mode is squash or merge commit and the head | ||
| 401 | // conflicts with the target or shares no history with it (rebase and push | 434 | // conflicts with the target or shares no history with it (rebase and push | ||
| 402 | - | // again), if the mode is not allowed by RepoSettings, or if a check fails | 435 | + | // again), if the mode is not allowed by RepoSettings, or if a check failed or |
| 403 | - | // and RepoSettings.failing_checks_block is set. Merges of one | 436 | + | // has not finished, unless ignore_checks is set. Merges of one |
| 404 | // repository run one at a time. Repeating a call that succeeded fails with | 437 | // repository run one at a time. Repeating a call that succeeded fails with | ||
| 405 | // failed_precondition (not open). On success the server publishes | 438 | // failed_precondition (not open). On success the server publishes | ||
| 406 | // MergeRequestMerged then Pushed for the target branch. | 439 | // MergeRequestMerged then Pushed for the target branch. | ||
| 407 | MergeMergeRequest(context.Context, *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) | 440 | MergeMergeRequest(context.Context, *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) | ||
| 408 | // EnableAutoMerge asks the server to merge an open merge request by itself | 441 | // EnableAutoMerge asks the server to merge an open merge request by itself | ||
| 409 | // once at least one check passed on its head, every run created on that head | 442 | // once at least one check passed on its head, every run created on that head | ||
| 410 | - | // is complete, and the merge would be accepted whatever | 443 | + | // is complete, and no check failed. It does not take ignore_checks. Needs |
| 411 | - | // RepoSettings.failing_checks_block says. Needs the mr:merge scope and, for a | 444 | + | // the mr:merge scope and, for a token limited to branches, write access to |
| 412 | - | // token limited to branches, write access to the target branch | 445 | + | // the target branch |
| 413 | // (permission_denied otherwise). The server records the caller, the mode and | 446 | // (permission_denied otherwise). The server records the caller, the mode and | ||
| 414 | // the head the caller saw; it merges as the caller, after resolving the caller | 447 | // the head the caller saw; it merges as the caller, after resolving the caller | ||
| 415 | // again, and cancels the auto-merge if the caller can no longer merge, if the | 448 | // again, and cancels the auto-merge if the caller can no longer merge, if the | ||
| @@ -490,6 +523,12 @@ func NewMergeRequestServiceHandler(svc MergeRequestServiceHandler, opts ...conne | |||||
| 490 | connect.WithSchema(mergeRequestServiceMethods.ByName("CloseMergeRequest")), | 523 | connect.WithSchema(mergeRequestServiceMethods.ByName("CloseMergeRequest")), | ||
| 491 | connect.WithHandlerOptions(opts...), | 524 | connect.WithHandlerOptions(opts...), | ||
| 492 | ) | 525 | ) | ||
| 526 | + | mergeRequestServiceMarkReadyHandler := connect.NewUnaryHandler( | |||
| 527 | + | MergeRequestServiceMarkReadyProcedure, | |||
| 528 | + | svc.MarkReady, | |||
| 529 | + | connect.WithSchema(mergeRequestServiceMethods.ByName("MarkReady")), | |||
| 530 | + | connect.WithHandlerOptions(opts...), | |||
| 531 | + | ) | |||
| 493 | mergeRequestServiceMergeMergeRequestHandler := connect.NewUnaryHandler( | 532 | mergeRequestServiceMergeMergeRequestHandler := connect.NewUnaryHandler( | ||
| 494 | MergeRequestServiceMergeMergeRequestProcedure, | 533 | MergeRequestServiceMergeMergeRequestProcedure, | ||
| 495 | svc.MergeMergeRequest, | 534 | svc.MergeMergeRequest, | ||
| @@ -532,6 +571,8 @@ func NewMergeRequestServiceHandler(svc MergeRequestServiceHandler, opts ...conne | |||||
| 532 | mergeRequestServiceResolveCommentHandler.ServeHTTP(w, r) | 571 | mergeRequestServiceResolveCommentHandler.ServeHTTP(w, r) | ||
| 533 | case MergeRequestServiceCloseMergeRequestProcedure: | 572 | case MergeRequestServiceCloseMergeRequestProcedure: | ||
| 534 | mergeRequestServiceCloseMergeRequestHandler.ServeHTTP(w, r) | 573 | mergeRequestServiceCloseMergeRequestHandler.ServeHTTP(w, r) | ||
| 574 | + | case MergeRequestServiceMarkReadyProcedure: | |||
| 575 | + | mergeRequestServiceMarkReadyHandler.ServeHTTP(w, r) | |||
| 535 | case MergeRequestServiceMergeMergeRequestProcedure: | 576 | case MergeRequestServiceMergeMergeRequestProcedure: | ||
| 536 | mergeRequestServiceMergeMergeRequestHandler.ServeHTTP(w, r) | 577 | mergeRequestServiceMergeMergeRequestHandler.ServeHTTP(w, r) | ||
| 537 | case MergeRequestServiceEnableAutoMergeProcedure: | 578 | case MergeRequestServiceEnableAutoMergeProcedure: | ||
| @@ -581,6 +622,10 @@ func (UnimplementedMergeRequestServiceHandler) CloseMergeRequest(context.Context | |||||
| 581 | return nil, connect.NewError(connect.CodeUnimplemented, errors.New("ermite.MergeRequestService.CloseMergeRequest is not implemented")) | 622 | return nil, connect.NewError(connect.CodeUnimplemented, errors.New("ermite.MergeRequestService.CloseMergeRequest is not implemented")) | ||
| 582 | } | 623 | } | ||
| 583 | 624 | ||||
| 625 | + | func (UnimplementedMergeRequestServiceHandler) MarkReady(context.Context, *connect.Request[ermite.MarkReadyRequest]) (*connect.Response[ermite.MarkReadyResponse], error) { | |||
| 626 | + | return nil, connect.NewError(connect.CodeUnimplemented, errors.New("ermite.MergeRequestService.MarkReady is not implemented")) | |||
| 627 | + | } | |||
| 628 | + | ||||
| 584 | func (UnimplementedMergeRequestServiceHandler) MergeMergeRequest(context.Context, *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) { | 629 | func (UnimplementedMergeRequestServiceHandler) MergeMergeRequest(context.Context, *connect.Request[ermite.MergeMergeRequestRequest]) (*connect.Response[ermite.MergeMergeRequestResponse], error) { | ||
| 585 | return nil, connect.NewError(connect.CodeUnimplemented, errors.New("ermite.MergeRequestService.MergeMergeRequest is not implemented")) | 630 | return nil, connect.NewError(connect.CodeUnimplemented, errors.New("ermite.MergeRequestService.MergeMergeRequest is not implemented")) | ||
| 586 | } | 631 | } | ||
M gen/ermite/merge_request.pb.go +217 -91
| @@ -2017,6 +2017,108 @@ func (x *CloseMergeRequestResponse) GetMergeRequest() *MergeRequest { | |||
| 2017 | 2017 | return nil | |
| 2018 | 2018 | } | |
| 2019 | 2019 | ||
| 2020 | + | // MarkReadyRequest names the draft merge request to mark ready. | |
| 2021 | + | type MarkReadyRequest struct { | |
| 2022 | + | state protoimpl.MessageState `protogen:"open.v1"` | |
| 2023 | + | // Repo is the repository name. | |
| 2024 | + | Repo string `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"` | |
| 2025 | + | // Number is the merge request number. | |
| 2026 | + | Number int64 `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"` | |
| 2027 | + | unknownFields protoimpl.UnknownFields | |
| 2028 | + | sizeCache protoimpl.SizeCache | |
| 2029 | + | } | |
| 2030 | + | ||
| 2031 | + | func (x *MarkReadyRequest) Reset() { | |
| 2032 | + | *x = MarkReadyRequest{} | |
| 2033 | + | mi := &file_ermite_merge_request_proto_msgTypes[21] | |
| 2034 | + | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2035 | + | ms.StoreMessageInfo(mi) | |
| 2036 | + | } | |
| 2037 | + | ||
| 2038 | + | func (x *MarkReadyRequest) String() string { | |
| 2039 | + | return protoimpl.X.MessageStringOf(x) | |
| 2040 | + | } | |
| 2041 | + | ||
| 2042 | + | func (*MarkReadyRequest) ProtoMessage() {} | |
| 2043 | + | ||
| 2044 | + | func (x *MarkReadyRequest) ProtoReflect() protoreflect.Message { | |
| 2045 | + | mi := &file_ermite_merge_request_proto_msgTypes[21] | |
| 2046 | + | if x != nil { | |
| 2047 | + | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2048 | + | if ms.LoadMessageInfo() == nil { | |
| 2049 | + | ms.StoreMessageInfo(mi) | |
| 2050 | + | } | |
| 2051 | + | return ms | |
| 2052 | + | } | |
| 2053 | + | return mi.MessageOf(x) | |
| 2054 | + | } | |
| 2055 | + | ||
| 2056 | + | // Deprecated: Use MarkReadyRequest.ProtoReflect.Descriptor instead. | |
| 2057 | + | func (*MarkReadyRequest) Descriptor() ([]byte, []int) { | |
| 2058 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{21} | |
| 2059 | + | } | |
| 2060 | + | ||
| 2061 | + | func (x *MarkReadyRequest) GetRepo() string { | |
| 2062 | + | if x != nil { | |
| 2063 | + | return x.Repo | |
| 2064 | + | } | |
| 2065 | + | return "" | |
| 2066 | + | } | |
| 2067 | + | ||
| 2068 | + | func (x *MarkReadyRequest) GetNumber() int64 { | |
| 2069 | + | if x != nil { | |
| 2070 | + | return x.Number | |
| 2071 | + | } | |
| 2072 | + | return 0 | |
| 2073 | + | } | |
| 2074 | + | ||
| 2075 | + | // MarkReadyResponse holds the merge request after marking it ready. | |
| 2076 | + | type MarkReadyResponse struct { | |
| 2077 | + | state protoimpl.MessageState `protogen:"open.v1"` | |
| 2078 | + | // MergeRequest is the merge request with its title stripped of the draft | |
| 2079 | + | // prefix. | |
| 2080 | + | MergeRequest *MergeRequest `protobuf:"bytes,1,opt,name=merge_request,json=mergeRequest,proto3" json:"merge_request,omitempty"` | |
| 2081 | + | unknownFields protoimpl.UnknownFields | |
| 2082 | + | sizeCache protoimpl.SizeCache | |
| 2083 | + | } | |
| 2084 | + | ||
| 2085 | + | func (x *MarkReadyResponse) Reset() { | |
| 2086 | + | *x = MarkReadyResponse{} | |
| 2087 | + | mi := &file_ermite_merge_request_proto_msgTypes[22] | |
| 2088 | + | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2089 | + | ms.StoreMessageInfo(mi) | |
| 2090 | + | } | |
| 2091 | + | ||
| 2092 | + | func (x *MarkReadyResponse) String() string { | |
| 2093 | + | return protoimpl.X.MessageStringOf(x) | |
| 2094 | + | } | |
| 2095 | + | ||
| 2096 | + | func (*MarkReadyResponse) ProtoMessage() {} | |
| 2097 | + | ||
| 2098 | + | func (x *MarkReadyResponse) ProtoReflect() protoreflect.Message { | |
| 2099 | + | mi := &file_ermite_merge_request_proto_msgTypes[22] | |
| 2100 | + | if x != nil { | |
| 2101 | + | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2102 | + | if ms.LoadMessageInfo() == nil { | |
| 2103 | + | ms.StoreMessageInfo(mi) | |
| 2104 | + | } | |
| 2105 | + | return ms | |
| 2106 | + | } | |
| 2107 | + | return mi.MessageOf(x) | |
| 2108 | + | } | |
| 2109 | + | ||
| 2110 | + | // Deprecated: Use MarkReadyResponse.ProtoReflect.Descriptor instead. | |
| 2111 | + | func (*MarkReadyResponse) Descriptor() ([]byte, []int) { | |
| 2112 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{22} | |
| 2113 | + | } | |
| 2114 | + | ||
| 2115 | + | func (x *MarkReadyResponse) GetMergeRequest() *MergeRequest { | |
| 2116 | + | if x != nil { | |
| 2117 | + | return x.MergeRequest | |
| 2118 | + | } | |
| 2119 | + | return nil | |
| 2120 | + | } | |
| 2121 | + | ||
| 2020 | 2122 | // MergeMergeRequestRequest describes the merge to perform. | |
| 2021 | 2123 | type MergeMergeRequestRequest struct { | |
| 2022 | 2124 | state protoimpl.MessageState `protogen:"open.v1"` | |
| @@ -2037,13 +2139,18 @@ type MergeMergeRequestRequest struct { | |||
| 2037 | 2139 | // request. Servers without the "merge_requests.delete_branch" feature ignore | |
| 2038 | 2140 | // it. | |
| 2039 | 2141 | DeleteSourceBranch bool `protobuf:"varint,5,opt,name=delete_source_branch,json=deleteSourceBranch,proto3" json:"delete_source_branch,omitempty"` | |
| 2040 | - | unknownFields protoimpl.UnknownFields | |
| 2041 | - | sizeCache protoimpl.SizeCache | |
| 2142 | + | // IgnoreChecks merges whatever the checks say. Needs the mr:force-merge | |
| 2143 | + | // scope (permission_denied otherwise). Servers without the | |
| 2144 | + | // "merge_requests.ignore_checks" feature ignore it: check the feature | |
| 2145 | + | // before setting it. | |
| 2146 | + | IgnoreChecks bool `protobuf:"varint,6,opt,name=ignore_checks,json=ignoreChecks,proto3" json:"ignore_checks,omitempty"` | |
| 2147 | + | unknownFields protoimpl.UnknownFields | |
| 2148 | + | sizeCache protoimpl.SizeCache | |
| 2042 | 2149 | } | |
| 2043 | 2150 | ||
| 2044 | 2151 | func (x *MergeMergeRequestRequest) Reset() { | |
| 2045 | 2152 | *x = MergeMergeRequestRequest{} | |
| 2046 | - | mi := &file_ermite_merge_request_proto_msgTypes[21] | |
| 2153 | + | mi := &file_ermite_merge_request_proto_msgTypes[23] | |
| 2047 | 2154 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2048 | 2155 | ms.StoreMessageInfo(mi) | |
| 2049 | 2156 | } | |
| @@ -2055,7 +2162,7 @@ func (x *MergeMergeRequestRequest) String() string { | |||
| 2055 | 2162 | func (*MergeMergeRequestRequest) ProtoMessage() {} | |
| 2056 | 2163 | ||
| 2057 | 2164 | func (x *MergeMergeRequestRequest) ProtoReflect() protoreflect.Message { | |
| 2058 | - | mi := &file_ermite_merge_request_proto_msgTypes[21] | |
| 2165 | + | mi := &file_ermite_merge_request_proto_msgTypes[23] | |
| 2059 | 2166 | if x != nil { | |
| 2060 | 2167 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2061 | 2168 | if ms.LoadMessageInfo() == nil { | |
| @@ -2068,7 +2175,7 @@ func (x *MergeMergeRequestRequest) ProtoReflect() protoreflect.Message { | |||
| 2068 | 2175 | ||
| 2069 | 2176 | // Deprecated: Use MergeMergeRequestRequest.ProtoReflect.Descriptor instead. | |
| 2070 | 2177 | func (*MergeMergeRequestRequest) Descriptor() ([]byte, []int) { | |
| 2071 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{21} | |
| 2178 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{23} | |
| 2072 | 2179 | } | |
| 2073 | 2180 | ||
| 2074 | 2181 | func (x *MergeMergeRequestRequest) GetRepo() string { | |
| @@ -2106,6 +2213,13 @@ func (x *MergeMergeRequestRequest) GetDeleteSourceBranch() bool { | |||
| 2106 | 2213 | return false | |
| 2107 | 2214 | } | |
| 2108 | 2215 | ||
| 2216 | + | func (x *MergeMergeRequestRequest) GetIgnoreChecks() bool { | |
| 2217 | + | if x != nil { | |
| 2218 | + | return x.IgnoreChecks | |
| 2219 | + | } | |
| 2220 | + | return false | |
| 2221 | + | } | |
| 2222 | + | ||
| 2109 | 2223 | // MergeMergeRequestResponse holds the merged merge request. | |
| 2110 | 2224 | type MergeMergeRequestResponse struct { | |
| 2111 | 2225 | state protoimpl.MessageState `protogen:"open.v1"` | |
| @@ -2125,7 +2239,7 @@ type MergeMergeRequestResponse struct { | |||
| 2125 | 2239 | ||
| 2126 | 2240 | func (x *MergeMergeRequestResponse) Reset() { | |
| 2127 | 2241 | *x = MergeMergeRequestResponse{} | |
| 2128 | - | mi := &file_ermite_merge_request_proto_msgTypes[22] | |
| 2242 | + | mi := &file_ermite_merge_request_proto_msgTypes[24] | |
| 2129 | 2243 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2130 | 2244 | ms.StoreMessageInfo(mi) | |
| 2131 | 2245 | } | |
| @@ -2137,7 +2251,7 @@ func (x *MergeMergeRequestResponse) String() string { | |||
| 2137 | 2251 | func (*MergeMergeRequestResponse) ProtoMessage() {} | |
| 2138 | 2252 | ||
| 2139 | 2253 | func (x *MergeMergeRequestResponse) ProtoReflect() protoreflect.Message { | |
| 2140 | - | mi := &file_ermite_merge_request_proto_msgTypes[22] | |
| 2254 | + | mi := &file_ermite_merge_request_proto_msgTypes[24] | |
| 2141 | 2255 | if x != nil { | |
| 2142 | 2256 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2143 | 2257 | if ms.LoadMessageInfo() == nil { | |
| @@ -2150,7 +2264,7 @@ func (x *MergeMergeRequestResponse) ProtoReflect() protoreflect.Message { | |||
| 2150 | 2264 | ||
| 2151 | 2265 | // Deprecated: Use MergeMergeRequestResponse.ProtoReflect.Descriptor instead. | |
| 2152 | 2266 | func (*MergeMergeRequestResponse) Descriptor() ([]byte, []int) { | |
| 2153 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{22} | |
| 2267 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{24} | |
| 2154 | 2268 | } | |
| 2155 | 2269 | ||
| 2156 | 2270 | func (x *MergeMergeRequestResponse) GetMergeRequest() *MergeRequest { | |
| @@ -2188,7 +2302,7 @@ type EnableAutoMergeRequest struct { | |||
| 2188 | 2302 | ||
| 2189 | 2303 | func (x *EnableAutoMergeRequest) Reset() { | |
| 2190 | 2304 | *x = EnableAutoMergeRequest{} | |
| 2191 | - | mi := &file_ermite_merge_request_proto_msgTypes[23] | |
| 2305 | + | mi := &file_ermite_merge_request_proto_msgTypes[25] | |
| 2192 | 2306 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2193 | 2307 | ms.StoreMessageInfo(mi) | |
| 2194 | 2308 | } | |
| @@ -2200,7 +2314,7 @@ func (x *EnableAutoMergeRequest) String() string { | |||
| 2200 | 2314 | func (*EnableAutoMergeRequest) ProtoMessage() {} | |
| 2201 | 2315 | ||
| 2202 | 2316 | func (x *EnableAutoMergeRequest) ProtoReflect() protoreflect.Message { | |
| 2203 | - | mi := &file_ermite_merge_request_proto_msgTypes[23] | |
| 2317 | + | mi := &file_ermite_merge_request_proto_msgTypes[25] | |
| 2204 | 2318 | if x != nil { | |
| 2205 | 2319 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2206 | 2320 | if ms.LoadMessageInfo() == nil { | |
| @@ -2213,7 +2327,7 @@ func (x *EnableAutoMergeRequest) ProtoReflect() protoreflect.Message { | |||
| 2213 | 2327 | ||
| 2214 | 2328 | // Deprecated: Use EnableAutoMergeRequest.ProtoReflect.Descriptor instead. | |
| 2215 | 2329 | func (*EnableAutoMergeRequest) Descriptor() ([]byte, []int) { | |
| 2216 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{23} | |
| 2330 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{25} | |
| 2217 | 2331 | } | |
| 2218 | 2332 | ||
| 2219 | 2333 | func (x *EnableAutoMergeRequest) GetRepo() string { | |
| @@ -2255,7 +2369,7 @@ type EnableAutoMergeResponse struct { | |||
| 2255 | 2369 | ||
| 2256 | 2370 | func (x *EnableAutoMergeResponse) Reset() { | |
| 2257 | 2371 | *x = EnableAutoMergeResponse{} | |
| 2258 | - | mi := &file_ermite_merge_request_proto_msgTypes[24] | |
| 2372 | + | mi := &file_ermite_merge_request_proto_msgTypes[26] | |
| 2259 | 2373 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2260 | 2374 | ms.StoreMessageInfo(mi) | |
| 2261 | 2375 | } | |
| @@ -2267,7 +2381,7 @@ func (x *EnableAutoMergeResponse) String() string { | |||
| 2267 | 2381 | func (*EnableAutoMergeResponse) ProtoMessage() {} | |
| 2268 | 2382 | ||
| 2269 | 2383 | func (x *EnableAutoMergeResponse) ProtoReflect() protoreflect.Message { | |
| 2270 | - | mi := &file_ermite_merge_request_proto_msgTypes[24] | |
| 2384 | + | mi := &file_ermite_merge_request_proto_msgTypes[26] | |
| 2271 | 2385 | if x != nil { | |
| 2272 | 2386 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2273 | 2387 | if ms.LoadMessageInfo() == nil { | |
| @@ -2280,7 +2394,7 @@ func (x *EnableAutoMergeResponse) ProtoReflect() protoreflect.Message { | |||
| 2280 | 2394 | ||
| 2281 | 2395 | // Deprecated: Use EnableAutoMergeResponse.ProtoReflect.Descriptor instead. | |
| 2282 | 2396 | func (*EnableAutoMergeResponse) Descriptor() ([]byte, []int) { | |
| 2283 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{24} | |
| 2397 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{26} | |
| 2284 | 2398 | } | |
| 2285 | 2399 | ||
| 2286 | 2400 | func (x *EnableAutoMergeResponse) GetMergeRequest() *MergeRequest { | |
| @@ -2303,7 +2417,7 @@ type CancelAutoMergeRequest struct { | |||
| 2303 | 2417 | ||
| 2304 | 2418 | func (x *CancelAutoMergeRequest) Reset() { | |
| 2305 | 2419 | *x = CancelAutoMergeRequest{} | |
| 2306 | - | mi := &file_ermite_merge_request_proto_msgTypes[25] | |
| 2420 | + | mi := &file_ermite_merge_request_proto_msgTypes[27] | |
| 2307 | 2421 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2308 | 2422 | ms.StoreMessageInfo(mi) | |
| 2309 | 2423 | } | |
| @@ -2315,7 +2429,7 @@ func (x *CancelAutoMergeRequest) String() string { | |||
| 2315 | 2429 | func (*CancelAutoMergeRequest) ProtoMessage() {} | |
| 2316 | 2430 | ||
| 2317 | 2431 | func (x *CancelAutoMergeRequest) ProtoReflect() protoreflect.Message { | |
| 2318 | - | mi := &file_ermite_merge_request_proto_msgTypes[25] | |
| 2432 | + | mi := &file_ermite_merge_request_proto_msgTypes[27] | |
| 2319 | 2433 | if x != nil { | |
| 2320 | 2434 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2321 | 2435 | if ms.LoadMessageInfo() == nil { | |
| @@ -2328,7 +2442,7 @@ func (x *CancelAutoMergeRequest) ProtoReflect() protoreflect.Message { | |||
| 2328 | 2442 | ||
| 2329 | 2443 | // Deprecated: Use CancelAutoMergeRequest.ProtoReflect.Descriptor instead. | |
| 2330 | 2444 | func (*CancelAutoMergeRequest) Descriptor() ([]byte, []int) { | |
| 2331 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{25} | |
| 2445 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{27} | |
| 2332 | 2446 | } | |
| 2333 | 2447 | ||
| 2334 | 2448 | func (x *CancelAutoMergeRequest) GetRepo() string { | |
| @@ -2356,7 +2470,7 @@ type CancelAutoMergeResponse struct { | |||
| 2356 | 2470 | ||
| 2357 | 2471 | func (x *CancelAutoMergeResponse) Reset() { | |
| 2358 | 2472 | *x = CancelAutoMergeResponse{} | |
| 2359 | - | mi := &file_ermite_merge_request_proto_msgTypes[26] | |
| 2473 | + | mi := &file_ermite_merge_request_proto_msgTypes[28] | |
| 2360 | 2474 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2361 | 2475 | ms.StoreMessageInfo(mi) | |
| 2362 | 2476 | } | |
| @@ -2368,7 +2482,7 @@ func (x *CancelAutoMergeResponse) String() string { | |||
| 2368 | 2482 | func (*CancelAutoMergeResponse) ProtoMessage() {} | |
| 2369 | 2483 | ||
| 2370 | 2484 | func (x *CancelAutoMergeResponse) ProtoReflect() protoreflect.Message { | |
| 2371 | - | mi := &file_ermite_merge_request_proto_msgTypes[26] | |
| 2485 | + | mi := &file_ermite_merge_request_proto_msgTypes[28] | |
| 2372 | 2486 | if x != nil { | |
| 2373 | 2487 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2374 | 2488 | if ms.LoadMessageInfo() == nil { | |
| @@ -2381,7 +2495,7 @@ func (x *CancelAutoMergeResponse) ProtoReflect() protoreflect.Message { | |||
| 2381 | 2495 | ||
| 2382 | 2496 | // Deprecated: Use CancelAutoMergeResponse.ProtoReflect.Descriptor instead. | |
| 2383 | 2497 | func (*CancelAutoMergeResponse) Descriptor() ([]byte, []int) { | |
| 2384 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{26} | |
| 2498 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{28} | |
| 2385 | 2499 | } | |
| 2386 | 2500 | ||
| 2387 | 2501 | func (x *CancelAutoMergeResponse) GetMergeRequest() *MergeRequest { | |
| @@ -2408,7 +2522,7 @@ type MarkReadRequest struct { | |||
| 2408 | 2522 | ||
| 2409 | 2523 | func (x *MarkReadRequest) Reset() { | |
| 2410 | 2524 | *x = MarkReadRequest{} | |
| 2411 | - | mi := &file_ermite_merge_request_proto_msgTypes[27] | |
| 2525 | + | mi := &file_ermite_merge_request_proto_msgTypes[29] | |
| 2412 | 2526 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2413 | 2527 | ms.StoreMessageInfo(mi) | |
| 2414 | 2528 | } | |
| @@ -2420,7 +2534,7 @@ func (x *MarkReadRequest) String() string { | |||
| 2420 | 2534 | func (*MarkReadRequest) ProtoMessage() {} | |
| 2421 | 2535 | ||
| 2422 | 2536 | func (x *MarkReadRequest) ProtoReflect() protoreflect.Message { | |
| 2423 | - | mi := &file_ermite_merge_request_proto_msgTypes[27] | |
| 2537 | + | mi := &file_ermite_merge_request_proto_msgTypes[29] | |
| 2424 | 2538 | if x != nil { | |
| 2425 | 2539 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2426 | 2540 | if ms.LoadMessageInfo() == nil { | |
| @@ -2433,7 +2547,7 @@ func (x *MarkReadRequest) ProtoReflect() protoreflect.Message { | |||
| 2433 | 2547 | ||
| 2434 | 2548 | // Deprecated: Use MarkReadRequest.ProtoReflect.Descriptor instead. | |
| 2435 | 2549 | func (*MarkReadRequest) Descriptor() ([]byte, []int) { | |
| 2436 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{27} | |
| 2550 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{29} | |
| 2437 | 2551 | } | |
| 2438 | 2552 | ||
| 2439 | 2553 | func (x *MarkReadRequest) GetRepo() string { | |
| @@ -2466,7 +2580,7 @@ type MarkReadResponse struct { | |||
| 2466 | 2580 | ||
| 2467 | 2581 | func (x *MarkReadResponse) Reset() { | |
| 2468 | 2582 | *x = MarkReadResponse{} | |
| 2469 | - | mi := &file_ermite_merge_request_proto_msgTypes[28] | |
| 2583 | + | mi := &file_ermite_merge_request_proto_msgTypes[30] | |
| 2470 | 2584 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2471 | 2585 | ms.StoreMessageInfo(mi) | |
| 2472 | 2586 | } | |
| @@ -2478,7 +2592,7 @@ func (x *MarkReadResponse) String() string { | |||
| 2478 | 2592 | func (*MarkReadResponse) ProtoMessage() {} | |
| 2479 | 2593 | ||
| 2480 | 2594 | func (x *MarkReadResponse) ProtoReflect() protoreflect.Message { | |
| 2481 | - | mi := &file_ermite_merge_request_proto_msgTypes[28] | |
| 2595 | + | mi := &file_ermite_merge_request_proto_msgTypes[30] | |
| 2482 | 2596 | if x != nil { | |
| 2483 | 2597 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |
| 2484 | 2598 | if ms.LoadMessageInfo() == nil { | |
| @@ -2491,7 +2605,7 @@ func (x *MarkReadResponse) ProtoReflect() protoreflect.Message { | |||
| 2491 | 2605 | ||
| 2492 | 2606 | // Deprecated: Use MarkReadResponse.ProtoReflect.Descriptor instead. | |
| 2493 | 2607 | func (*MarkReadResponse) Descriptor() ([]byte, []int) { | |
| 2494 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{28} | |
| 2608 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{30} | |
| 2495 | 2609 | } | |
| 2496 | 2610 | ||
| 2497 | 2611 | var File_ermite_merge_request_proto protoreflect.FileDescriptor | |
| @@ -2641,13 +2755,19 @@ const file_ermite_merge_request_proto_rawDesc = "" + | |||
| 2641 | 2755 | "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" + | |
| 2642 | 2756 | "\x06number\x18\x02 \x01(\x03R\x06number\"V\n" + | |
| 2643 | 2757 | "\x19CloseMergeRequestResponse\x129\n" + | |
| 2644 | - | "\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"\xb8\x01\n" + | |
| 2758 | + | "\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\">\n" + | |
| 2759 | + | "\x10MarkReadyRequest\x12\x12\n" + | |
| 2760 | + | "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" + | |
| 2761 | + | "\x06number\x18\x02 \x01(\x03R\x06number\"N\n" + | |
| 2762 | + | "\x11MarkReadyResponse\x129\n" + | |
| 2763 | + | "\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"\xdd\x01\n" + | |
| 2645 | 2764 | "\x18MergeMergeRequestRequest\x12\x12\n" + | |
| 2646 | 2765 | "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" + | |
| 2647 | 2766 | "\x06number\x18\x02 \x01(\x03R\x06number\x12%\n" + | |
| 2648 | 2767 | "\x04mode\x18\x03 \x01(\x0e2\x11.ermite.MergeModeR\x04mode\x12\x17\n" + | |
| 2649 | 2768 | "\ahead_id\x18\x04 \x01(\tR\x06headId\x120\n" + | |
| 2650 | - | "\x14delete_source_branch\x18\x05 \x01(\bR\x12deleteSourceBranch\"\x8a\x01\n" + | |
| 2769 | + | "\x14delete_source_branch\x18\x05 \x01(\bR\x12deleteSourceBranch\x12#\n" + | |
| 2770 | + | "\rignore_checks\x18\x06 \x01(\bR\fignoreChecks\"\x8a\x01\n" + | |
| 2651 | 2771 | "\x19MergeMergeRequestResponse\x129\n" + | |
| 2652 | 2772 | "\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\x122\n" + | |
| 2653 | 2773 | "\x15source_branch_deleted\x18\x02 \x01(\bR\x13sourceBranchDeleted\"\x84\x01\n" + | |
| @@ -2686,7 +2806,7 @@ const file_ermite_merge_request_proto_rawDesc = "" + | |||
| 2686 | 2806 | "\x1bMERGEABILITY_STATE_CHECKING\x10\x01\x12!\n" + | |
| 2687 | 2807 | "\x1dMERGEABILITY_STATE_UP_TO_DATE\x10\x02\x12\x1d\n" + | |
| 2688 | 2808 | "\x19MERGEABILITY_STATE_BEHIND\x10\x03\x12\x1f\n" + | |
| 2689 | - | "\x1bMERGEABILITY_STATE_CONFLICT\x10\x042\xe7\a\n" + | |
| 2809 | + | "\x1bMERGEABILITY_STATE_CONFLICT\x10\x042\xa9\b\n" + | |
| 2690 | 2810 | "\x13MergeRequestService\x12[\n" + | |
| 2691 | 2811 | "\x12CreateMergeRequest\x12!.ermite.CreateMergeRequestRequest\x1a\".ermite.CreateMergeRequestResponse\x12X\n" + | |
| 2692 | 2812 | "\x11ListMergeRequests\x12 .ermite.ListMergeRequestsRequest\x1a!.ermite.ListMergeRequestsResponse\x12R\n" + | |
| @@ -2696,7 +2816,8 @@ const file_ermite_merge_request_proto_rawDesc = "" + | |||
| 2696 | 2816 | "\vEditComment\x12\x1a.ermite.EditCommentRequest\x1a\x1b.ermite.EditCommentResponse\x12L\n" + | |
| 2697 | 2817 | "\rDeleteComment\x12\x1c.ermite.DeleteCommentRequest\x1a\x1d.ermite.DeleteCommentResponse\x12O\n" + | |
| 2698 | 2818 | "\x0eResolveComment\x12\x1d.ermite.ResolveCommentRequest\x1a\x1e.ermite.ResolveCommentResponse\x12X\n" + | |
| 2699 | - | "\x11CloseMergeRequest\x12 .ermite.CloseMergeRequestRequest\x1a!.ermite.CloseMergeRequestResponse\x12X\n" + | |
| 2819 | + | "\x11CloseMergeRequest\x12 .ermite.CloseMergeRequestRequest\x1a!.ermite.CloseMergeRequestResponse\x12@\n" + | |
| 2820 | + | "\tMarkReady\x12\x18.ermite.MarkReadyRequest\x1a\x19.ermite.MarkReadyResponse\x12X\n" + | |
| 2700 | 2821 | "\x11MergeMergeRequest\x12 .ermite.MergeMergeRequestRequest\x1a!.ermite.MergeMergeRequestResponse\x12R\n" + | |
| 2701 | 2822 | "\x0fEnableAutoMerge\x12\x1e.ermite.EnableAutoMergeRequest\x1a\x1f.ermite.EnableAutoMergeResponse\x12R\n" + | |
| 2702 | 2823 | "\x0fCancelAutoMerge\x12\x1e.ermite.CancelAutoMergeRequest\x1a\x1f.ermite.CancelAutoMergeResponse\x12=\n" + | |
| @@ -2717,7 +2838,7 @@ func file_ermite_merge_request_proto_rawDescGZIP() []byte { | |||
| 2717 | 2838 | } | |
| 2718 | 2839 | ||
| 2719 | 2840 | var file_ermite_merge_request_proto_enumTypes = make([]protoimpl.EnumInfo, 4) | |
| 2720 | - | var file_ermite_merge_request_proto_msgTypes = make([]protoimpl.MessageInfo, 29) | |
| 2841 | + | var file_ermite_merge_request_proto_msgTypes = make([]protoimpl.MessageInfo, 31) | |
| 2721 | 2842 | var file_ermite_merge_request_proto_goTypes = []any{ | |
| 2722 | 2843 | (MergeRequestState)(0), // 0: ermite.MergeRequestState | |
| 2723 | 2844 | (DiffSide)(0), // 1: ermite.DiffSide | |
| @@ -2744,44 +2865,46 @@ var file_ermite_merge_request_proto_goTypes = []any{ | |||
| 2744 | 2865 | (*ResolveCommentResponse)(nil), // 22: ermite.ResolveCommentResponse | |
| 2745 | 2866 | (*CloseMergeRequestRequest)(nil), // 23: ermite.CloseMergeRequestRequest | |
| 2746 | 2867 | (*CloseMergeRequestResponse)(nil), // 24: ermite.CloseMergeRequestResponse | |
| 2747 | - | (*MergeMergeRequestRequest)(nil), // 25: ermite.MergeMergeRequestRequest | |
| 2748 | - | (*MergeMergeRequestResponse)(nil), // 26: ermite.MergeMergeRequestResponse | |
| 2749 | - | (*EnableAutoMergeRequest)(nil), // 27: ermite.EnableAutoMergeRequest | |
| 2750 | - | (*EnableAutoMergeResponse)(nil), // 28: ermite.EnableAutoMergeResponse | |
| 2751 | - | (*CancelAutoMergeRequest)(nil), // 29: ermite.CancelAutoMergeRequest | |
| 2752 | - | (*CancelAutoMergeResponse)(nil), // 30: ermite.CancelAutoMergeResponse | |
| 2753 | - | (*MarkReadRequest)(nil), // 31: ermite.MarkReadRequest | |
| 2754 | - | (*MarkReadResponse)(nil), // 32: ermite.MarkReadResponse | |
| 2755 | - | (*timestamppb.Timestamp)(nil), // 33: google.protobuf.Timestamp | |
| 2756 | - | (MergeMode)(0), // 34: ermite.MergeMode | |
| 2757 | - | (*Commit)(nil), // 35: ermite.Commit | |
| 2758 | - | (*DiffStats)(nil), // 36: ermite.DiffStats | |
| 2759 | - | (*Diff)(nil), // 37: ermite.Diff | |
| 2868 | + | (*MarkReadyRequest)(nil), // 25: ermite.MarkReadyRequest | |
| 2869 | + | (*MarkReadyResponse)(nil), // 26: ermite.MarkReadyResponse | |
| 2870 | + | (*MergeMergeRequestRequest)(nil), // 27: ermite.MergeMergeRequestRequest | |
| 2871 | + | (*MergeMergeRequestResponse)(nil), // 28: ermite.MergeMergeRequestResponse | |
| 2872 | + | (*EnableAutoMergeRequest)(nil), // 29: ermite.EnableAutoMergeRequest | |
| 2873 | + | (*EnableAutoMergeResponse)(nil), // 30: ermite.EnableAutoMergeResponse | |
| 2874 | + | (*CancelAutoMergeRequest)(nil), // 31: ermite.CancelAutoMergeRequest | |
| 2875 | + | (*CancelAutoMergeResponse)(nil), // 32: ermite.CancelAutoMergeResponse | |
| 2876 | + | (*MarkReadRequest)(nil), // 33: ermite.MarkReadRequest | |
| 2877 | + | (*MarkReadResponse)(nil), // 34: ermite.MarkReadResponse | |
| 2878 | + | (*timestamppb.Timestamp)(nil), // 35: google.protobuf.Timestamp | |
| 2879 | + | (MergeMode)(0), // 36: ermite.MergeMode | |
| 2880 | + | (*Commit)(nil), // 37: ermite.Commit | |
| 2881 | + | (*DiffStats)(nil), // 38: ermite.DiffStats | |
| 2882 | + | (*Diff)(nil), // 39: ermite.Diff | |
| 2760 | 2883 | } | |
| 2761 | 2884 | var file_ermite_merge_request_proto_depIdxs = []int32{ | |
| 2762 | 2885 | 3, // 0: ermite.Mergeability.state:type_name -> ermite.MergeabilityState | |
| 2763 | - | 33, // 1: ermite.Mergeability.checked_at:type_name -> google.protobuf.Timestamp | |
| 2764 | - | 34, // 2: ermite.AutoMerge.mode:type_name -> ermite.MergeMode | |
| 2765 | - | 33, // 3: ermite.AutoMerge.enabled_at:type_name -> google.protobuf.Timestamp | |
| 2886 | + | 35, // 1: ermite.Mergeability.checked_at:type_name -> google.protobuf.Timestamp | |
| 2887 | + | 36, // 2: ermite.AutoMerge.mode:type_name -> ermite.MergeMode | |
| 2888 | + | 35, // 3: ermite.AutoMerge.enabled_at:type_name -> google.protobuf.Timestamp | |
| 2766 | 2889 | 0, // 4: ermite.MergeRequest.state:type_name -> ermite.MergeRequestState | |
| 2767 | - | 33, // 5: ermite.MergeRequest.created_at:type_name -> google.protobuf.Timestamp | |
| 2768 | - | 33, // 6: ermite.MergeRequest.updated_at:type_name -> google.protobuf.Timestamp | |
| 2769 | - | 34, // 7: ermite.MergeRequest.merge_mode:type_name -> ermite.MergeMode | |
| 2890 | + | 35, // 5: ermite.MergeRequest.created_at:type_name -> google.protobuf.Timestamp | |
| 2891 | + | 35, // 6: ermite.MergeRequest.updated_at:type_name -> google.protobuf.Timestamp | |
| 2892 | + | 36, // 7: ermite.MergeRequest.merge_mode:type_name -> ermite.MergeMode | |
| 2770 | 2893 | 4, // 8: ermite.MergeRequest.mergeability:type_name -> ermite.Mergeability | |
| 2771 | 2894 | 5, // 9: ermite.MergeRequest.auto_merge:type_name -> ermite.AutoMerge | |
| 2772 | 2895 | 1, // 10: ermite.Comment.side:type_name -> ermite.DiffSide | |
| 2773 | - | 33, // 11: ermite.Comment.created_at:type_name -> google.protobuf.Timestamp | |
| 2896 | + | 35, // 11: ermite.Comment.created_at:type_name -> google.protobuf.Timestamp | |
| 2774 | 2897 | 2, // 12: ermite.Comment.verdict:type_name -> ermite.Verdict | |
| 2775 | - | 33, // 13: ermite.Comment.edited_at:type_name -> google.protobuf.Timestamp | |
| 2898 | + | 35, // 13: ermite.Comment.edited_at:type_name -> google.protobuf.Timestamp | |
| 2776 | 2899 | 2, // 14: ermite.AuthorVerdict.verdict:type_name -> ermite.Verdict | |
| 2777 | - | 33, // 15: ermite.AuthorVerdict.created_at:type_name -> google.protobuf.Timestamp | |
| 2900 | + | 35, // 15: ermite.AuthorVerdict.created_at:type_name -> google.protobuf.Timestamp | |
| 2778 | 2901 | 6, // 16: ermite.CreateMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | |
| 2779 | 2902 | 0, // 17: ermite.ListMergeRequestsRequest.state:type_name -> ermite.MergeRequestState | |
| 2780 | 2903 | 6, // 18: ermite.ListMergeRequestsResponse.merge_requests:type_name -> ermite.MergeRequest | |
| 2781 | 2904 | 6, // 19: ermite.GetMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | |
| 2782 | - | 35, // 20: ermite.GetMergeRequestResponse.commits:type_name -> ermite.Commit | |
| 2783 | - | 36, // 21: ermite.GetMergeRequestResponse.stats:type_name -> ermite.DiffStats | |
| 2784 | - | 37, // 22: ermite.GetMergeRequestResponse.diff:type_name -> ermite.Diff | |
| 2905 | + | 37, // 20: ermite.GetMergeRequestResponse.commits:type_name -> ermite.Commit | |
| 2906 | + | 38, // 21: ermite.GetMergeRequestResponse.stats:type_name -> ermite.DiffStats | |
| 2907 | + | 39, // 22: ermite.GetMergeRequestResponse.diff:type_name -> ermite.Diff | |
| 2785 | 2908 | 7, // 23: ermite.GetMergeRequestResponse.comments:type_name -> ermite.Comment | |
| 2786 | 2909 | 8, // 24: ermite.GetMergeRequestResponse.verdicts:type_name -> ermite.AuthorVerdict | |
| 2787 | 2910 | 1, // 25: ermite.AddCommentRequest.side:type_name -> ermite.DiffSide | |
| @@ -2791,40 +2914,43 @@ var file_ermite_merge_request_proto_depIdxs = []int32{ | |||
| 2791 | 2914 | 7, // 29: ermite.DeleteCommentResponse.comment:type_name -> ermite.Comment | |
| 2792 | 2915 | 7, // 30: ermite.ResolveCommentResponse.comment:type_name -> ermite.Comment | |
| 2793 | 2916 | 6, // 31: ermite.CloseMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | |
| 2794 | - | 34, // 32: ermite.MergeMergeRequestRequest.mode:type_name -> ermite.MergeMode | |
| 2795 | - | 6, // 33: ermite.MergeMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | |
| 2796 | - | 34, // 34: ermite.EnableAutoMergeRequest.mode:type_name -> ermite.MergeMode | |
| 2797 | - | 6, // 35: ermite.EnableAutoMergeResponse.merge_request:type_name -> ermite.MergeRequest | |
| 2798 | - | 6, // 36: ermite.CancelAutoMergeResponse.merge_request:type_name -> ermite.MergeRequest | |
| 2799 | - | 9, // 37: ermite.MergeRequestService.CreateMergeRequest:input_type -> ermite.CreateMergeRequestRequest | |
| 2800 | - | 11, // 38: ermite.MergeRequestService.ListMergeRequests:input_type -> ermite.ListMergeRequestsRequest | |
| 2801 | - | 13, // 39: ermite.MergeRequestService.GetMergeRequest:input_type -> ermite.GetMergeRequestRequest | |
| 2802 | - | 15, // 40: ermite.MergeRequestService.AddComment:input_type -> ermite.AddCommentRequest | |
| 2803 | - | 17, // 41: ermite.MergeRequestService.EditComment:input_type -> ermite.EditCommentRequest | |
| 2804 | - | 19, // 42: ermite.MergeRequestService.DeleteComment:input_type -> ermite.DeleteCommentRequest | |
| 2805 | - | 21, // 43: ermite.MergeRequestService.ResolveComment:input_type -> ermite.ResolveCommentRequest | |
| 2806 | - | 23, // 44: ermite.MergeRequestService.CloseMergeRequest:input_type -> ermite.CloseMergeRequestRequest | |
| 2807 | - | 25, // 45: ermite.MergeRequestService.MergeMergeRequest:input_type -> ermite.MergeMergeRequestRequest | |
| 2808 | - | 27, // 46: ermite.MergeRequestService.EnableAutoMerge:input_type -> ermite.EnableAutoMergeRequest | |
| 2809 | - | 29, // 47: ermite.MergeRequestService.CancelAutoMerge:input_type -> ermite.CancelAutoMergeRequest | |
| 2810 | - | 31, // 48: ermite.MergeRequestService.MarkRead:input_type -> ermite.MarkReadRequest | |
| 2811 | - | 10, // 49: ermite.MergeRequestService.CreateMergeRequest:output_type -> ermite.CreateMergeRequestResponse | |
| 2812 | - | 12, // 50: ermite.MergeRequestService.ListMergeRequests:output_type -> ermite.ListMergeRequestsResponse | |
| 2813 | - | 14, // 51: ermite.MergeRequestService.GetMergeRequest:output_type -> ermite.GetMergeRequestResponse | |
| 2814 | - | 16, // 52: ermite.MergeRequestService.AddComment:output_type -> ermite.AddCommentResponse | |
| 2815 | - | 18, // 53: ermite.MergeRequestService.EditComment:output_type -> ermite.EditCommentResponse | |
| 2816 | - | 20, // 54: ermite.MergeRequestService.DeleteComment:output_type -> ermite.DeleteCommentResponse | |
| 2817 | - | 22, // 55: ermite.MergeRequestService.ResolveComment:output_type -> ermite.ResolveCommentResponse | |
| 2818 | - | 24, // 56: ermite.MergeRequestService.CloseMergeRequest:output_type -> ermite.CloseMergeRequestResponse | |
| 2819 | - | 26, // 57: ermite.MergeRequestService.MergeMergeRequest:output_type -> ermite.MergeMergeRequestResponse | |
| 2820 | - | 28, // 58: ermite.MergeRequestService.EnableAutoMerge:output_type -> ermite.EnableAutoMergeResponse | |
| 2821 | - | 30, // 59: ermite.MergeRequestService.CancelAutoMerge:output_type -> ermite.CancelAutoMergeResponse | |
| 2822 | - | 32, // 60: ermite.MergeRequestService.MarkRead:output_type -> ermite.MarkReadResponse | |
| 2823 | - | 49, // [49:61] is the sub-list for method output_type | |
| 2824 | - | 37, // [37:49] is the sub-list for method input_type | |
| 2825 | - | 37, // [37:37] is the sub-list for extension type_name | |
| 2826 | - | 37, // [37:37] is the sub-list for extension extendee | |
| 2827 | - | 0, // [0:37] is the sub-list for field type_name | |
| 2917 | + | 6, // 32: ermite.MarkReadyResponse.merge_request:type_name -> ermite.MergeRequest | |
| 2918 | + | 36, // 33: ermite.MergeMergeRequestRequest.mode:type_name -> ermite.MergeMode | |
| 2919 | + | 6, // 34: ermite.MergeMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | |
| 2920 | + | 36, // 35: ermite.EnableAutoMergeRequest.mode:type_name -> ermite.MergeMode | |
| 2921 | + | 6, // 36: ermite.EnableAutoMergeResponse.merge_request:type_name -> ermite.MergeRequest | |
| 2922 | + | 6, // 37: ermite.CancelAutoMergeResponse.merge_request:type_name -> ermite.MergeRequest | |
| 2923 | + | 9, // 38: ermite.MergeRequestService.CreateMergeRequest:input_type -> ermite.CreateMergeRequestRequest | |
| 2924 | + | 11, // 39: ermite.MergeRequestService.ListMergeRequests:input_type -> ermite.ListMergeRequestsRequest | |
| 2925 | + | 13, // 40: ermite.MergeRequestService.GetMergeRequest:input_type -> ermite.GetMergeRequestRequest | |
| 2926 | + | 15, // 41: ermite.MergeRequestService.AddComment:input_type -> ermite.AddCommentRequest | |
| 2927 | + | 17, // 42: ermite.MergeRequestService.EditComment:input_type -> ermite.EditCommentRequest | |
| 2928 | + | 19, // 43: ermite.MergeRequestService.DeleteComment:input_type -> ermite.DeleteCommentRequest | |
| 2929 | + | 21, // 44: ermite.MergeRequestService.ResolveComment:input_type -> ermite.ResolveCommentRequest | |
| 2930 | + | 23, // 45: ermite.MergeRequestService.CloseMergeRequest:input_type -> ermite.CloseMergeRequestRequest | |
| 2931 | + | 25, // 46: ermite.MergeRequestService.MarkReady:input_type -> ermite.MarkReadyRequest | |
| 2932 | + | 27, // 47: ermite.MergeRequestService.MergeMergeRequest:input_type -> ermite.MergeMergeRequestRequest | |
| 2933 | + | 29, // 48: ermite.MergeRequestService.EnableAutoMerge:input_type -> ermite.EnableAutoMergeRequest | |
| 2934 | + | 31, // 49: ermite.MergeRequestService.CancelAutoMerge:input_type -> ermite.CancelAutoMergeRequest | |
| 2935 | + | 33, // 50: ermite.MergeRequestService.MarkRead:input_type -> ermite.MarkReadRequest | |
| 2936 | + | 10, // 51: ermite.MergeRequestService.CreateMergeRequest:output_type -> ermite.CreateMergeRequestResponse | |
| 2937 | + | 12, // 52: ermite.MergeRequestService.ListMergeRequests:output_type -> ermite.ListMergeRequestsResponse | |
| 2938 | + | 14, // 53: ermite.MergeRequestService.GetMergeRequest:output_type -> ermite.GetMergeRequestResponse | |
| 2939 | + | 16, // 54: ermite.MergeRequestService.AddComment:output_type -> ermite.AddCommentResponse | |
| 2940 | + | 18, // 55: ermite.MergeRequestService.EditComment:output_type -> ermite.EditCommentResponse | |
| 2941 | + | 20, // 56: ermite.MergeRequestService.DeleteComment:output_type -> ermite.DeleteCommentResponse | |
| 2942 | + | 22, // 57: ermite.MergeRequestService.ResolveComment:output_type -> ermite.ResolveCommentResponse | |
| 2943 | + | 24, // 58: ermite.MergeRequestService.CloseMergeRequest:output_type -> ermite.CloseMergeRequestResponse | |
| 2944 | + | 26, // 59: ermite.MergeRequestService.MarkReady:output_type -> ermite.MarkReadyResponse | |
| 2945 | + | 28, // 60: ermite.MergeRequestService.MergeMergeRequest:output_type -> ermite.MergeMergeRequestResponse | |
| 2946 | + | 30, // 61: ermite.MergeRequestService.EnableAutoMerge:output_type -> ermite.EnableAutoMergeResponse | |
| 2947 | + | 32, // 62: ermite.MergeRequestService.CancelAutoMerge:output_type -> ermite.CancelAutoMergeResponse | |
| 2948 | + | 34, // 63: ermite.MergeRequestService.MarkRead:output_type -> ermite.MarkReadResponse | |
| 2949 | + | 51, // [51:64] is the sub-list for method output_type | |
| 2950 | + | 38, // [38:51] is the sub-list for method input_type | |
| 2951 | + | 38, // [38:38] is the sub-list for extension type_name | |
| 2952 | + | 38, // [38:38] is the sub-list for extension extendee | |
| 2953 | + | 0, // [0:38] is the sub-list for field type_name | |
| 2828 | 2954 | } | |
| 2829 | 2955 | ||
| 2830 | 2956 | func init() { file_ermite_merge_request_proto_init() } | |
| @@ -2840,7 +2966,7 @@ func file_ermite_merge_request_proto_init() { | |||
| 2840 | 2966 | GoPackagePath: reflect.TypeOf(x{}).PkgPath(), | |
| 2841 | 2967 | RawDescriptor: unsafe.Slice(unsafe.StringData(file_ermite_merge_request_proto_rawDesc), len(file_ermite_merge_request_proto_rawDesc)), | |
| 2842 | 2968 | NumEnums: 4, | |
| 2843 | - | NumMessages: 29, | |
| 2969 | + | NumMessages: 31, | |
| 2844 | 2970 | NumExtensions: 0, | |
| 2845 | 2971 | NumServices: 1, | |
| 2846 | 2972 | }, | |
| @@ -2017,6 +2017,108 @@ func (x *CloseMergeRequestResponse) GetMergeRequest() *MergeRequest { | |||||
| 2017 | return nil | 2017 | return nil | ||
| 2018 | } | 2018 | } | ||
| 2019 | 2019 | ||||
| 2020 | + | // MarkReadyRequest names the draft merge request to mark ready. | |||
| 2021 | + | type MarkReadyRequest struct { | |||
| 2022 | + | state protoimpl.MessageState `protogen:"open.v1"` | |||
| 2023 | + | // Repo is the repository name. | |||
| 2024 | + | Repo string `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"` | |||
| 2025 | + | // Number is the merge request number. | |||
| 2026 | + | Number int64 `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"` | |||
| 2027 | + | unknownFields protoimpl.UnknownFields | |||
| 2028 | + | sizeCache protoimpl.SizeCache | |||
| 2029 | + | } | |||
| 2030 | + | ||||
| 2031 | + | func (x *MarkReadyRequest) Reset() { | |||
| 2032 | + | *x = MarkReadyRequest{} | |||
| 2033 | + | mi := &file_ermite_merge_request_proto_msgTypes[21] | |||
| 2034 | + | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |||
| 2035 | + | ms.StoreMessageInfo(mi) | |||
| 2036 | + | } | |||
| 2037 | + | ||||
| 2038 | + | func (x *MarkReadyRequest) String() string { | |||
| 2039 | + | return protoimpl.X.MessageStringOf(x) | |||
| 2040 | + | } | |||
| 2041 | + | ||||
| 2042 | + | func (*MarkReadyRequest) ProtoMessage() {} | |||
| 2043 | + | ||||
| 2044 | + | func (x *MarkReadyRequest) ProtoReflect() protoreflect.Message { | |||
| 2045 | + | mi := &file_ermite_merge_request_proto_msgTypes[21] | |||
| 2046 | + | if x != nil { | |||
| 2047 | + | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |||
| 2048 | + | if ms.LoadMessageInfo() == nil { | |||
| 2049 | + | ms.StoreMessageInfo(mi) | |||
| 2050 | + | } | |||
| 2051 | + | return ms | |||
| 2052 | + | } | |||
| 2053 | + | return mi.MessageOf(x) | |||
| 2054 | + | } | |||
| 2055 | + | ||||
| 2056 | + | // Deprecated: Use MarkReadyRequest.ProtoReflect.Descriptor instead. | |||
| 2057 | + | func (*MarkReadyRequest) Descriptor() ([]byte, []int) { | |||
| 2058 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{21} | |||
| 2059 | + | } | |||
| 2060 | + | ||||
| 2061 | + | func (x *MarkReadyRequest) GetRepo() string { | |||
| 2062 | + | if x != nil { | |||
| 2063 | + | return x.Repo | |||
| 2064 | + | } | |||
| 2065 | + | return "" | |||
| 2066 | + | } | |||
| 2067 | + | ||||
| 2068 | + | func (x *MarkReadyRequest) GetNumber() int64 { | |||
| 2069 | + | if x != nil { | |||
| 2070 | + | return x.Number | |||
| 2071 | + | } | |||
| 2072 | + | return 0 | |||
| 2073 | + | } | |||
| 2074 | + | ||||
| 2075 | + | // MarkReadyResponse holds the merge request after marking it ready. | |||
| 2076 | + | type MarkReadyResponse struct { | |||
| 2077 | + | state protoimpl.MessageState `protogen:"open.v1"` | |||
| 2078 | + | // MergeRequest is the merge request with its title stripped of the draft | |||
| 2079 | + | // prefix. | |||
| 2080 | + | MergeRequest *MergeRequest `protobuf:"bytes,1,opt,name=merge_request,json=mergeRequest,proto3" json:"merge_request,omitempty"` | |||
| 2081 | + | unknownFields protoimpl.UnknownFields | |||
| 2082 | + | sizeCache protoimpl.SizeCache | |||
| 2083 | + | } | |||
| 2084 | + | ||||
| 2085 | + | func (x *MarkReadyResponse) Reset() { | |||
| 2086 | + | *x = MarkReadyResponse{} | |||
| 2087 | + | mi := &file_ermite_merge_request_proto_msgTypes[22] | |||
| 2088 | + | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |||
| 2089 | + | ms.StoreMessageInfo(mi) | |||
| 2090 | + | } | |||
| 2091 | + | ||||
| 2092 | + | func (x *MarkReadyResponse) String() string { | |||
| 2093 | + | return protoimpl.X.MessageStringOf(x) | |||
| 2094 | + | } | |||
| 2095 | + | ||||
| 2096 | + | func (*MarkReadyResponse) ProtoMessage() {} | |||
| 2097 | + | ||||
| 2098 | + | func (x *MarkReadyResponse) ProtoReflect() protoreflect.Message { | |||
| 2099 | + | mi := &file_ermite_merge_request_proto_msgTypes[22] | |||
| 2100 | + | if x != nil { | |||
| 2101 | + | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | |||
| 2102 | + | if ms.LoadMessageInfo() == nil { | |||
| 2103 | + | ms.StoreMessageInfo(mi) | |||
| 2104 | + | } | |||
| 2105 | + | return ms | |||
| 2106 | + | } | |||
| 2107 | + | return mi.MessageOf(x) | |||
| 2108 | + | } | |||
| 2109 | + | ||||
| 2110 | + | // Deprecated: Use MarkReadyResponse.ProtoReflect.Descriptor instead. | |||
| 2111 | + | func (*MarkReadyResponse) Descriptor() ([]byte, []int) { | |||
| 2112 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{22} | |||
| 2113 | + | } | |||
| 2114 | + | ||||
| 2115 | + | func (x *MarkReadyResponse) GetMergeRequest() *MergeRequest { | |||
| 2116 | + | if x != nil { | |||
| 2117 | + | return x.MergeRequest | |||
| 2118 | + | } | |||
| 2119 | + | return nil | |||
| 2120 | + | } | |||
| 2121 | + | ||||
| 2020 | // MergeMergeRequestRequest describes the merge to perform. | 2122 | // MergeMergeRequestRequest describes the merge to perform. | ||
| 2021 | type MergeMergeRequestRequest struct { | 2123 | type MergeMergeRequestRequest struct { | ||
| 2022 | state protoimpl.MessageState `protogen:"open.v1"` | 2124 | state protoimpl.MessageState `protogen:"open.v1"` | ||
| @@ -2037,13 +2139,18 @@ type MergeMergeRequestRequest struct { | |||||
| 2037 | // request. Servers without the "merge_requests.delete_branch" feature ignore | 2139 | // request. Servers without the "merge_requests.delete_branch" feature ignore | ||
| 2038 | // it. | 2140 | // it. | ||
| 2039 | DeleteSourceBranch bool `protobuf:"varint,5,opt,name=delete_source_branch,json=deleteSourceBranch,proto3" json:"delete_source_branch,omitempty"` | 2141 | DeleteSourceBranch bool `protobuf:"varint,5,opt,name=delete_source_branch,json=deleteSourceBranch,proto3" json:"delete_source_branch,omitempty"` | ||
| 2040 | - | unknownFields protoimpl.UnknownFields | 2142 | + | // IgnoreChecks merges whatever the checks say. Needs the mr:force-merge |
| 2041 | - | sizeCache protoimpl.SizeCache | 2143 | + | // scope (permission_denied otherwise). Servers without the |
| 2144 | + | // "merge_requests.ignore_checks" feature ignore it: check the feature | |||
| 2145 | + | // before setting it. | |||
| 2146 | + | IgnoreChecks bool `protobuf:"varint,6,opt,name=ignore_checks,json=ignoreChecks,proto3" json:"ignore_checks,omitempty"` | |||
| 2147 | + | unknownFields protoimpl.UnknownFields | |||
| 2148 | + | sizeCache protoimpl.SizeCache | |||
| 2042 | } | 2149 | } | ||
| 2043 | 2150 | ||||
| 2044 | func (x *MergeMergeRequestRequest) Reset() { | 2151 | func (x *MergeMergeRequestRequest) Reset() { | ||
| 2045 | *x = MergeMergeRequestRequest{} | 2152 | *x = MergeMergeRequestRequest{} | ||
| 2046 | - | mi := &file_ermite_merge_request_proto_msgTypes[21] | 2153 | + | mi := &file_ermite_merge_request_proto_msgTypes[23] |
| 2047 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2154 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2048 | ms.StoreMessageInfo(mi) | 2155 | ms.StoreMessageInfo(mi) | ||
| 2049 | } | 2156 | } | ||
| @@ -2055,7 +2162,7 @@ func (x *MergeMergeRequestRequest) String() string { | |||||
| 2055 | func (*MergeMergeRequestRequest) ProtoMessage() {} | 2162 | func (*MergeMergeRequestRequest) ProtoMessage() {} | ||
| 2056 | 2163 | ||||
| 2057 | func (x *MergeMergeRequestRequest) ProtoReflect() protoreflect.Message { | 2164 | func (x *MergeMergeRequestRequest) ProtoReflect() protoreflect.Message { | ||
| 2058 | - | mi := &file_ermite_merge_request_proto_msgTypes[21] | 2165 | + | mi := &file_ermite_merge_request_proto_msgTypes[23] |
| 2059 | if x != nil { | 2166 | if x != nil { | ||
| 2060 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2167 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2061 | if ms.LoadMessageInfo() == nil { | 2168 | if ms.LoadMessageInfo() == nil { | ||
| @@ -2068,7 +2175,7 @@ func (x *MergeMergeRequestRequest) ProtoReflect() protoreflect.Message { | |||||
| 2068 | 2175 | ||||
| 2069 | // Deprecated: Use MergeMergeRequestRequest.ProtoReflect.Descriptor instead. | 2176 | // Deprecated: Use MergeMergeRequestRequest.ProtoReflect.Descriptor instead. | ||
| 2070 | func (*MergeMergeRequestRequest) Descriptor() ([]byte, []int) { | 2177 | func (*MergeMergeRequestRequest) Descriptor() ([]byte, []int) { | ||
| 2071 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{21} | 2178 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{23} |
| 2072 | } | 2179 | } | ||
| 2073 | 2180 | ||||
| 2074 | func (x *MergeMergeRequestRequest) GetRepo() string { | 2181 | func (x *MergeMergeRequestRequest) GetRepo() string { | ||
| @@ -2106,6 +2213,13 @@ func (x *MergeMergeRequestRequest) GetDeleteSourceBranch() bool { | |||||
| 2106 | return false | 2213 | return false | ||
| 2107 | } | 2214 | } | ||
| 2108 | 2215 | ||||
| 2216 | + | func (x *MergeMergeRequestRequest) GetIgnoreChecks() bool { | |||
| 2217 | + | if x != nil { | |||
| 2218 | + | return x.IgnoreChecks | |||
| 2219 | + | } | |||
| 2220 | + | return false | |||
| 2221 | + | } | |||
| 2222 | + | ||||
| 2109 | // MergeMergeRequestResponse holds the merged merge request. | 2223 | // MergeMergeRequestResponse holds the merged merge request. | ||
| 2110 | type MergeMergeRequestResponse struct { | 2224 | type MergeMergeRequestResponse struct { | ||
| 2111 | state protoimpl.MessageState `protogen:"open.v1"` | 2225 | state protoimpl.MessageState `protogen:"open.v1"` | ||
| @@ -2125,7 +2239,7 @@ type MergeMergeRequestResponse struct { | |||||
| 2125 | 2239 | ||||
| 2126 | func (x *MergeMergeRequestResponse) Reset() { | 2240 | func (x *MergeMergeRequestResponse) Reset() { | ||
| 2127 | *x = MergeMergeRequestResponse{} | 2241 | *x = MergeMergeRequestResponse{} | ||
| 2128 | - | mi := &file_ermite_merge_request_proto_msgTypes[22] | 2242 | + | mi := &file_ermite_merge_request_proto_msgTypes[24] |
| 2129 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2243 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2130 | ms.StoreMessageInfo(mi) | 2244 | ms.StoreMessageInfo(mi) | ||
| 2131 | } | 2245 | } | ||
| @@ -2137,7 +2251,7 @@ func (x *MergeMergeRequestResponse) String() string { | |||||
| 2137 | func (*MergeMergeRequestResponse) ProtoMessage() {} | 2251 | func (*MergeMergeRequestResponse) ProtoMessage() {} | ||
| 2138 | 2252 | ||||
| 2139 | func (x *MergeMergeRequestResponse) ProtoReflect() protoreflect.Message { | 2253 | func (x *MergeMergeRequestResponse) ProtoReflect() protoreflect.Message { | ||
| 2140 | - | mi := &file_ermite_merge_request_proto_msgTypes[22] | 2254 | + | mi := &file_ermite_merge_request_proto_msgTypes[24] |
| 2141 | if x != nil { | 2255 | if x != nil { | ||
| 2142 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2256 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2143 | if ms.LoadMessageInfo() == nil { | 2257 | if ms.LoadMessageInfo() == nil { | ||
| @@ -2150,7 +2264,7 @@ func (x *MergeMergeRequestResponse) ProtoReflect() protoreflect.Message { | |||||
| 2150 | 2264 | ||||
| 2151 | // Deprecated: Use MergeMergeRequestResponse.ProtoReflect.Descriptor instead. | 2265 | // Deprecated: Use MergeMergeRequestResponse.ProtoReflect.Descriptor instead. | ||
| 2152 | func (*MergeMergeRequestResponse) Descriptor() ([]byte, []int) { | 2266 | func (*MergeMergeRequestResponse) Descriptor() ([]byte, []int) { | ||
| 2153 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{22} | 2267 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{24} |
| 2154 | } | 2268 | } | ||
| 2155 | 2269 | ||||
| 2156 | func (x *MergeMergeRequestResponse) GetMergeRequest() *MergeRequest { | 2270 | func (x *MergeMergeRequestResponse) GetMergeRequest() *MergeRequest { | ||
| @@ -2188,7 +2302,7 @@ type EnableAutoMergeRequest struct { | |||||
| 2188 | 2302 | ||||
| 2189 | func (x *EnableAutoMergeRequest) Reset() { | 2303 | func (x *EnableAutoMergeRequest) Reset() { | ||
| 2190 | *x = EnableAutoMergeRequest{} | 2304 | *x = EnableAutoMergeRequest{} | ||
| 2191 | - | mi := &file_ermite_merge_request_proto_msgTypes[23] | 2305 | + | mi := &file_ermite_merge_request_proto_msgTypes[25] |
| 2192 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2306 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2193 | ms.StoreMessageInfo(mi) | 2307 | ms.StoreMessageInfo(mi) | ||
| 2194 | } | 2308 | } | ||
| @@ -2200,7 +2314,7 @@ func (x *EnableAutoMergeRequest) String() string { | |||||
| 2200 | func (*EnableAutoMergeRequest) ProtoMessage() {} | 2314 | func (*EnableAutoMergeRequest) ProtoMessage() {} | ||
| 2201 | 2315 | ||||
| 2202 | func (x *EnableAutoMergeRequest) ProtoReflect() protoreflect.Message { | 2316 | func (x *EnableAutoMergeRequest) ProtoReflect() protoreflect.Message { | ||
| 2203 | - | mi := &file_ermite_merge_request_proto_msgTypes[23] | 2317 | + | mi := &file_ermite_merge_request_proto_msgTypes[25] |
| 2204 | if x != nil { | 2318 | if x != nil { | ||
| 2205 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2319 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2206 | if ms.LoadMessageInfo() == nil { | 2320 | if ms.LoadMessageInfo() == nil { | ||
| @@ -2213,7 +2327,7 @@ func (x *EnableAutoMergeRequest) ProtoReflect() protoreflect.Message { | |||||
| 2213 | 2327 | ||||
| 2214 | // Deprecated: Use EnableAutoMergeRequest.ProtoReflect.Descriptor instead. | 2328 | // Deprecated: Use EnableAutoMergeRequest.ProtoReflect.Descriptor instead. | ||
| 2215 | func (*EnableAutoMergeRequest) Descriptor() ([]byte, []int) { | 2329 | func (*EnableAutoMergeRequest) Descriptor() ([]byte, []int) { | ||
| 2216 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{23} | 2330 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{25} |
| 2217 | } | 2331 | } | ||
| 2218 | 2332 | ||||
| 2219 | func (x *EnableAutoMergeRequest) GetRepo() string { | 2333 | func (x *EnableAutoMergeRequest) GetRepo() string { | ||
| @@ -2255,7 +2369,7 @@ type EnableAutoMergeResponse struct { | |||||
| 2255 | 2369 | ||||
| 2256 | func (x *EnableAutoMergeResponse) Reset() { | 2370 | func (x *EnableAutoMergeResponse) Reset() { | ||
| 2257 | *x = EnableAutoMergeResponse{} | 2371 | *x = EnableAutoMergeResponse{} | ||
| 2258 | - | mi := &file_ermite_merge_request_proto_msgTypes[24] | 2372 | + | mi := &file_ermite_merge_request_proto_msgTypes[26] |
| 2259 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2373 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2260 | ms.StoreMessageInfo(mi) | 2374 | ms.StoreMessageInfo(mi) | ||
| 2261 | } | 2375 | } | ||
| @@ -2267,7 +2381,7 @@ func (x *EnableAutoMergeResponse) String() string { | |||||
| 2267 | func (*EnableAutoMergeResponse) ProtoMessage() {} | 2381 | func (*EnableAutoMergeResponse) ProtoMessage() {} | ||
| 2268 | 2382 | ||||
| 2269 | func (x *EnableAutoMergeResponse) ProtoReflect() protoreflect.Message { | 2383 | func (x *EnableAutoMergeResponse) ProtoReflect() protoreflect.Message { | ||
| 2270 | - | mi := &file_ermite_merge_request_proto_msgTypes[24] | 2384 | + | mi := &file_ermite_merge_request_proto_msgTypes[26] |
| 2271 | if x != nil { | 2385 | if x != nil { | ||
| 2272 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2386 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2273 | if ms.LoadMessageInfo() == nil { | 2387 | if ms.LoadMessageInfo() == nil { | ||
| @@ -2280,7 +2394,7 @@ func (x *EnableAutoMergeResponse) ProtoReflect() protoreflect.Message { | |||||
| 2280 | 2394 | ||||
| 2281 | // Deprecated: Use EnableAutoMergeResponse.ProtoReflect.Descriptor instead. | 2395 | // Deprecated: Use EnableAutoMergeResponse.ProtoReflect.Descriptor instead. | ||
| 2282 | func (*EnableAutoMergeResponse) Descriptor() ([]byte, []int) { | 2396 | func (*EnableAutoMergeResponse) Descriptor() ([]byte, []int) { | ||
| 2283 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{24} | 2397 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{26} |
| 2284 | } | 2398 | } | ||
| 2285 | 2399 | ||||
| 2286 | func (x *EnableAutoMergeResponse) GetMergeRequest() *MergeRequest { | 2400 | func (x *EnableAutoMergeResponse) GetMergeRequest() *MergeRequest { | ||
| @@ -2303,7 +2417,7 @@ type CancelAutoMergeRequest struct { | |||||
| 2303 | 2417 | ||||
| 2304 | func (x *CancelAutoMergeRequest) Reset() { | 2418 | func (x *CancelAutoMergeRequest) Reset() { | ||
| 2305 | *x = CancelAutoMergeRequest{} | 2419 | *x = CancelAutoMergeRequest{} | ||
| 2306 | - | mi := &file_ermite_merge_request_proto_msgTypes[25] | 2420 | + | mi := &file_ermite_merge_request_proto_msgTypes[27] |
| 2307 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2421 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2308 | ms.StoreMessageInfo(mi) | 2422 | ms.StoreMessageInfo(mi) | ||
| 2309 | } | 2423 | } | ||
| @@ -2315,7 +2429,7 @@ func (x *CancelAutoMergeRequest) String() string { | |||||
| 2315 | func (*CancelAutoMergeRequest) ProtoMessage() {} | 2429 | func (*CancelAutoMergeRequest) ProtoMessage() {} | ||
| 2316 | 2430 | ||||
| 2317 | func (x *CancelAutoMergeRequest) ProtoReflect() protoreflect.Message { | 2431 | func (x *CancelAutoMergeRequest) ProtoReflect() protoreflect.Message { | ||
| 2318 | - | mi := &file_ermite_merge_request_proto_msgTypes[25] | 2432 | + | mi := &file_ermite_merge_request_proto_msgTypes[27] |
| 2319 | if x != nil { | 2433 | if x != nil { | ||
| 2320 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2434 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2321 | if ms.LoadMessageInfo() == nil { | 2435 | if ms.LoadMessageInfo() == nil { | ||
| @@ -2328,7 +2442,7 @@ func (x *CancelAutoMergeRequest) ProtoReflect() protoreflect.Message { | |||||
| 2328 | 2442 | ||||
| 2329 | // Deprecated: Use CancelAutoMergeRequest.ProtoReflect.Descriptor instead. | 2443 | // Deprecated: Use CancelAutoMergeRequest.ProtoReflect.Descriptor instead. | ||
| 2330 | func (*CancelAutoMergeRequest) Descriptor() ([]byte, []int) { | 2444 | func (*CancelAutoMergeRequest) Descriptor() ([]byte, []int) { | ||
| 2331 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{25} | 2445 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{27} |
| 2332 | } | 2446 | } | ||
| 2333 | 2447 | ||||
| 2334 | func (x *CancelAutoMergeRequest) GetRepo() string { | 2448 | func (x *CancelAutoMergeRequest) GetRepo() string { | ||
| @@ -2356,7 +2470,7 @@ type CancelAutoMergeResponse struct { | |||||
| 2356 | 2470 | ||||
| 2357 | func (x *CancelAutoMergeResponse) Reset() { | 2471 | func (x *CancelAutoMergeResponse) Reset() { | ||
| 2358 | *x = CancelAutoMergeResponse{} | 2472 | *x = CancelAutoMergeResponse{} | ||
| 2359 | - | mi := &file_ermite_merge_request_proto_msgTypes[26] | 2473 | + | mi := &file_ermite_merge_request_proto_msgTypes[28] |
| 2360 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2474 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2361 | ms.StoreMessageInfo(mi) | 2475 | ms.StoreMessageInfo(mi) | ||
| 2362 | } | 2476 | } | ||
| @@ -2368,7 +2482,7 @@ func (x *CancelAutoMergeResponse) String() string { | |||||
| 2368 | func (*CancelAutoMergeResponse) ProtoMessage() {} | 2482 | func (*CancelAutoMergeResponse) ProtoMessage() {} | ||
| 2369 | 2483 | ||||
| 2370 | func (x *CancelAutoMergeResponse) ProtoReflect() protoreflect.Message { | 2484 | func (x *CancelAutoMergeResponse) ProtoReflect() protoreflect.Message { | ||
| 2371 | - | mi := &file_ermite_merge_request_proto_msgTypes[26] | 2485 | + | mi := &file_ermite_merge_request_proto_msgTypes[28] |
| 2372 | if x != nil { | 2486 | if x != nil { | ||
| 2373 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2487 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2374 | if ms.LoadMessageInfo() == nil { | 2488 | if ms.LoadMessageInfo() == nil { | ||
| @@ -2381,7 +2495,7 @@ func (x *CancelAutoMergeResponse) ProtoReflect() protoreflect.Message { | |||||
| 2381 | 2495 | ||||
| 2382 | // Deprecated: Use CancelAutoMergeResponse.ProtoReflect.Descriptor instead. | 2496 | // Deprecated: Use CancelAutoMergeResponse.ProtoReflect.Descriptor instead. | ||
| 2383 | func (*CancelAutoMergeResponse) Descriptor() ([]byte, []int) { | 2497 | func (*CancelAutoMergeResponse) Descriptor() ([]byte, []int) { | ||
| 2384 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{26} | 2498 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{28} |
| 2385 | } | 2499 | } | ||
| 2386 | 2500 | ||||
| 2387 | func (x *CancelAutoMergeResponse) GetMergeRequest() *MergeRequest { | 2501 | func (x *CancelAutoMergeResponse) GetMergeRequest() *MergeRequest { | ||
| @@ -2408,7 +2522,7 @@ type MarkReadRequest struct { | |||||
| 2408 | 2522 | ||||
| 2409 | func (x *MarkReadRequest) Reset() { | 2523 | func (x *MarkReadRequest) Reset() { | ||
| 2410 | *x = MarkReadRequest{} | 2524 | *x = MarkReadRequest{} | ||
| 2411 | - | mi := &file_ermite_merge_request_proto_msgTypes[27] | 2525 | + | mi := &file_ermite_merge_request_proto_msgTypes[29] |
| 2412 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2526 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2413 | ms.StoreMessageInfo(mi) | 2527 | ms.StoreMessageInfo(mi) | ||
| 2414 | } | 2528 | } | ||
| @@ -2420,7 +2534,7 @@ func (x *MarkReadRequest) String() string { | |||||
| 2420 | func (*MarkReadRequest) ProtoMessage() {} | 2534 | func (*MarkReadRequest) ProtoMessage() {} | ||
| 2421 | 2535 | ||||
| 2422 | func (x *MarkReadRequest) ProtoReflect() protoreflect.Message { | 2536 | func (x *MarkReadRequest) ProtoReflect() protoreflect.Message { | ||
| 2423 | - | mi := &file_ermite_merge_request_proto_msgTypes[27] | 2537 | + | mi := &file_ermite_merge_request_proto_msgTypes[29] |
| 2424 | if x != nil { | 2538 | if x != nil { | ||
| 2425 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2539 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2426 | if ms.LoadMessageInfo() == nil { | 2540 | if ms.LoadMessageInfo() == nil { | ||
| @@ -2433,7 +2547,7 @@ func (x *MarkReadRequest) ProtoReflect() protoreflect.Message { | |||||
| 2433 | 2547 | ||||
| 2434 | // Deprecated: Use MarkReadRequest.ProtoReflect.Descriptor instead. | 2548 | // Deprecated: Use MarkReadRequest.ProtoReflect.Descriptor instead. | ||
| 2435 | func (*MarkReadRequest) Descriptor() ([]byte, []int) { | 2549 | func (*MarkReadRequest) Descriptor() ([]byte, []int) { | ||
| 2436 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{27} | 2550 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{29} |
| 2437 | } | 2551 | } | ||
| 2438 | 2552 | ||||
| 2439 | func (x *MarkReadRequest) GetRepo() string { | 2553 | func (x *MarkReadRequest) GetRepo() string { | ||
| @@ -2466,7 +2580,7 @@ type MarkReadResponse struct { | |||||
| 2466 | 2580 | ||||
| 2467 | func (x *MarkReadResponse) Reset() { | 2581 | func (x *MarkReadResponse) Reset() { | ||
| 2468 | *x = MarkReadResponse{} | 2582 | *x = MarkReadResponse{} | ||
| 2469 | - | mi := &file_ermite_merge_request_proto_msgTypes[28] | 2583 | + | mi := &file_ermite_merge_request_proto_msgTypes[30] |
| 2470 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2584 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2471 | ms.StoreMessageInfo(mi) | 2585 | ms.StoreMessageInfo(mi) | ||
| 2472 | } | 2586 | } | ||
| @@ -2478,7 +2592,7 @@ func (x *MarkReadResponse) String() string { | |||||
| 2478 | func (*MarkReadResponse) ProtoMessage() {} | 2592 | func (*MarkReadResponse) ProtoMessage() {} | ||
| 2479 | 2593 | ||||
| 2480 | func (x *MarkReadResponse) ProtoReflect() protoreflect.Message { | 2594 | func (x *MarkReadResponse) ProtoReflect() protoreflect.Message { | ||
| 2481 | - | mi := &file_ermite_merge_request_proto_msgTypes[28] | 2595 | + | mi := &file_ermite_merge_request_proto_msgTypes[30] |
| 2482 | if x != nil { | 2596 | if x != nil { | ||
| 2483 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 2597 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | ||
| 2484 | if ms.LoadMessageInfo() == nil { | 2598 | if ms.LoadMessageInfo() == nil { | ||
| @@ -2491,7 +2605,7 @@ func (x *MarkReadResponse) ProtoReflect() protoreflect.Message { | |||||
| 2491 | 2605 | ||||
| 2492 | // Deprecated: Use MarkReadResponse.ProtoReflect.Descriptor instead. | 2606 | // Deprecated: Use MarkReadResponse.ProtoReflect.Descriptor instead. | ||
| 2493 | func (*MarkReadResponse) Descriptor() ([]byte, []int) { | 2607 | func (*MarkReadResponse) Descriptor() ([]byte, []int) { | ||
| 2494 | - | return file_ermite_merge_request_proto_rawDescGZIP(), []int{28} | 2608 | + | return file_ermite_merge_request_proto_rawDescGZIP(), []int{30} |
| 2495 | } | 2609 | } | ||
| 2496 | 2610 | ||||
| 2497 | var File_ermite_merge_request_proto protoreflect.FileDescriptor | 2611 | var File_ermite_merge_request_proto protoreflect.FileDescriptor | ||
| @@ -2641,13 +2755,19 @@ const file_ermite_merge_request_proto_rawDesc = "" + | |||||
| 2641 | "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" + | 2755 | "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" + | ||
| 2642 | "\x06number\x18\x02 \x01(\x03R\x06number\"V\n" + | 2756 | "\x06number\x18\x02 \x01(\x03R\x06number\"V\n" + | ||
| 2643 | "\x19CloseMergeRequestResponse\x129\n" + | 2757 | "\x19CloseMergeRequestResponse\x129\n" + | ||
| 2644 | - | "\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"\xb8\x01\n" + | 2758 | + | "\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\">\n" + |
| 2759 | + | "\x10MarkReadyRequest\x12\x12\n" + | |||
| 2760 | + | "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" + | |||
| 2761 | + | "\x06number\x18\x02 \x01(\x03R\x06number\"N\n" + | |||
| 2762 | + | "\x11MarkReadyResponse\x129\n" + | |||
| 2763 | + | "\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\"\xdd\x01\n" + | |||
| 2645 | "\x18MergeMergeRequestRequest\x12\x12\n" + | 2764 | "\x18MergeMergeRequestRequest\x12\x12\n" + | ||
| 2646 | "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" + | 2765 | "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" + | ||
| 2647 | "\x06number\x18\x02 \x01(\x03R\x06number\x12%\n" + | 2766 | "\x06number\x18\x02 \x01(\x03R\x06number\x12%\n" + | ||
| 2648 | "\x04mode\x18\x03 \x01(\x0e2\x11.ermite.MergeModeR\x04mode\x12\x17\n" + | 2767 | "\x04mode\x18\x03 \x01(\x0e2\x11.ermite.MergeModeR\x04mode\x12\x17\n" + | ||
| 2649 | "\ahead_id\x18\x04 \x01(\tR\x06headId\x120\n" + | 2768 | "\ahead_id\x18\x04 \x01(\tR\x06headId\x120\n" + | ||
| 2650 | - | "\x14delete_source_branch\x18\x05 \x01(\bR\x12deleteSourceBranch\"\x8a\x01\n" + | 2769 | + | "\x14delete_source_branch\x18\x05 \x01(\bR\x12deleteSourceBranch\x12#\n" + |
| 2770 | + | "\rignore_checks\x18\x06 \x01(\bR\fignoreChecks\"\x8a\x01\n" + | |||
| 2651 | "\x19MergeMergeRequestResponse\x129\n" + | 2771 | "\x19MergeMergeRequestResponse\x129\n" + | ||
| 2652 | "\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\x122\n" + | 2772 | "\rmerge_request\x18\x01 \x01(\v2\x14.ermite.MergeRequestR\fmergeRequest\x122\n" + | ||
| 2653 | "\x15source_branch_deleted\x18\x02 \x01(\bR\x13sourceBranchDeleted\"\x84\x01\n" + | 2773 | "\x15source_branch_deleted\x18\x02 \x01(\bR\x13sourceBranchDeleted\"\x84\x01\n" + | ||
| @@ -2686,7 +2806,7 @@ const file_ermite_merge_request_proto_rawDesc = "" + | |||||
| 2686 | "\x1bMERGEABILITY_STATE_CHECKING\x10\x01\x12!\n" + | 2806 | "\x1bMERGEABILITY_STATE_CHECKING\x10\x01\x12!\n" + | ||
| 2687 | "\x1dMERGEABILITY_STATE_UP_TO_DATE\x10\x02\x12\x1d\n" + | 2807 | "\x1dMERGEABILITY_STATE_UP_TO_DATE\x10\x02\x12\x1d\n" + | ||
| 2688 | "\x19MERGEABILITY_STATE_BEHIND\x10\x03\x12\x1f\n" + | 2808 | "\x19MERGEABILITY_STATE_BEHIND\x10\x03\x12\x1f\n" + | ||
| 2689 | - | "\x1bMERGEABILITY_STATE_CONFLICT\x10\x042\xe7\a\n" + | 2809 | + | "\x1bMERGEABILITY_STATE_CONFLICT\x10\x042\xa9\b\n" + |
| 2690 | "\x13MergeRequestService\x12[\n" + | 2810 | "\x13MergeRequestService\x12[\n" + | ||
| 2691 | "\x12CreateMergeRequest\x12!.ermite.CreateMergeRequestRequest\x1a\".ermite.CreateMergeRequestResponse\x12X\n" + | 2811 | "\x12CreateMergeRequest\x12!.ermite.CreateMergeRequestRequest\x1a\".ermite.CreateMergeRequestResponse\x12X\n" + | ||
| 2692 | "\x11ListMergeRequests\x12 .ermite.ListMergeRequestsRequest\x1a!.ermite.ListMergeRequestsResponse\x12R\n" + | 2812 | "\x11ListMergeRequests\x12 .ermite.ListMergeRequestsRequest\x1a!.ermite.ListMergeRequestsResponse\x12R\n" + | ||
| @@ -2696,7 +2816,8 @@ const file_ermite_merge_request_proto_rawDesc = "" + | |||||
| 2696 | "\vEditComment\x12\x1a.ermite.EditCommentRequest\x1a\x1b.ermite.EditCommentResponse\x12L\n" + | 2816 | "\vEditComment\x12\x1a.ermite.EditCommentRequest\x1a\x1b.ermite.EditCommentResponse\x12L\n" + | ||
| 2697 | "\rDeleteComment\x12\x1c.ermite.DeleteCommentRequest\x1a\x1d.ermite.DeleteCommentResponse\x12O\n" + | 2817 | "\rDeleteComment\x12\x1c.ermite.DeleteCommentRequest\x1a\x1d.ermite.DeleteCommentResponse\x12O\n" + | ||
| 2698 | "\x0eResolveComment\x12\x1d.ermite.ResolveCommentRequest\x1a\x1e.ermite.ResolveCommentResponse\x12X\n" + | 2818 | "\x0eResolveComment\x12\x1d.ermite.ResolveCommentRequest\x1a\x1e.ermite.ResolveCommentResponse\x12X\n" + | ||
| 2699 | - | "\x11CloseMergeRequest\x12 .ermite.CloseMergeRequestRequest\x1a!.ermite.CloseMergeRequestResponse\x12X\n" + | 2819 | + | "\x11CloseMergeRequest\x12 .ermite.CloseMergeRequestRequest\x1a!.ermite.CloseMergeRequestResponse\x12@\n" + |
| 2820 | + | "\tMarkReady\x12\x18.ermite.MarkReadyRequest\x1a\x19.ermite.MarkReadyResponse\x12X\n" + | |||
| 2700 | "\x11MergeMergeRequest\x12 .ermite.MergeMergeRequestRequest\x1a!.ermite.MergeMergeRequestResponse\x12R\n" + | 2821 | "\x11MergeMergeRequest\x12 .ermite.MergeMergeRequestRequest\x1a!.ermite.MergeMergeRequestResponse\x12R\n" + | ||
| 2701 | "\x0fEnableAutoMerge\x12\x1e.ermite.EnableAutoMergeRequest\x1a\x1f.ermite.EnableAutoMergeResponse\x12R\n" + | 2822 | "\x0fEnableAutoMerge\x12\x1e.ermite.EnableAutoMergeRequest\x1a\x1f.ermite.EnableAutoMergeResponse\x12R\n" + | ||
| 2702 | "\x0fCancelAutoMerge\x12\x1e.ermite.CancelAutoMergeRequest\x1a\x1f.ermite.CancelAutoMergeResponse\x12=\n" + | 2823 | "\x0fCancelAutoMerge\x12\x1e.ermite.CancelAutoMergeRequest\x1a\x1f.ermite.CancelAutoMergeResponse\x12=\n" + | ||
| @@ -2717,7 +2838,7 @@ func file_ermite_merge_request_proto_rawDescGZIP() []byte { | |||||
| 2717 | } | 2838 | } | ||
| 2718 | 2839 | ||||
| 2719 | var file_ermite_merge_request_proto_enumTypes = make([]protoimpl.EnumInfo, 4) | 2840 | var file_ermite_merge_request_proto_enumTypes = make([]protoimpl.EnumInfo, 4) | ||
| 2720 | - | var file_ermite_merge_request_proto_msgTypes = make([]protoimpl.MessageInfo, 29) | 2841 | + | var file_ermite_merge_request_proto_msgTypes = make([]protoimpl.MessageInfo, 31) |
| 2721 | var file_ermite_merge_request_proto_goTypes = []any{ | 2842 | var file_ermite_merge_request_proto_goTypes = []any{ | ||
| 2722 | (MergeRequestState)(0), // 0: ermite.MergeRequestState | 2843 | (MergeRequestState)(0), // 0: ermite.MergeRequestState | ||
| 2723 | (DiffSide)(0), // 1: ermite.DiffSide | 2844 | (DiffSide)(0), // 1: ermite.DiffSide | ||
| @@ -2744,44 +2865,46 @@ var file_ermite_merge_request_proto_goTypes = []any{ | |||||
| 2744 | (*ResolveCommentResponse)(nil), // 22: ermite.ResolveCommentResponse | 2865 | (*ResolveCommentResponse)(nil), // 22: ermite.ResolveCommentResponse | ||
| 2745 | (*CloseMergeRequestRequest)(nil), // 23: ermite.CloseMergeRequestRequest | 2866 | (*CloseMergeRequestRequest)(nil), // 23: ermite.CloseMergeRequestRequest | ||
| 2746 | (*CloseMergeRequestResponse)(nil), // 24: ermite.CloseMergeRequestResponse | 2867 | (*CloseMergeRequestResponse)(nil), // 24: ermite.CloseMergeRequestResponse | ||
| 2747 | - | (*MergeMergeRequestRequest)(nil), // 25: ermite.MergeMergeRequestRequest | 2868 | + | (*MarkReadyRequest)(nil), // 25: ermite.MarkReadyRequest |
| 2748 | - | (*MergeMergeRequestResponse)(nil), // 26: ermite.MergeMergeRequestResponse | 2869 | + | (*MarkReadyResponse)(nil), // 26: ermite.MarkReadyResponse |
| 2749 | - | (*EnableAutoMergeRequest)(nil), // 27: ermite.EnableAutoMergeRequest | 2870 | + | (*MergeMergeRequestRequest)(nil), // 27: ermite.MergeMergeRequestRequest |
| 2750 | - | (*EnableAutoMergeResponse)(nil), // 28: ermite.EnableAutoMergeResponse | 2871 | + | (*MergeMergeRequestResponse)(nil), // 28: ermite.MergeMergeRequestResponse |
| 2751 | - | (*CancelAutoMergeRequest)(nil), // 29: ermite.CancelAutoMergeRequest | 2872 | + | (*EnableAutoMergeRequest)(nil), // 29: ermite.EnableAutoMergeRequest |
| 2752 | - | (*CancelAutoMergeResponse)(nil), // 30: ermite.CancelAutoMergeResponse | 2873 | + | (*EnableAutoMergeResponse)(nil), // 30: ermite.EnableAutoMergeResponse |
| 2753 | - | (*MarkReadRequest)(nil), // 31: ermite.MarkReadRequest | 2874 | + | (*CancelAutoMergeRequest)(nil), // 31: ermite.CancelAutoMergeRequest |
| 2754 | - | (*MarkReadResponse)(nil), // 32: ermite.MarkReadResponse | 2875 | + | (*CancelAutoMergeResponse)(nil), // 32: ermite.CancelAutoMergeResponse |
| 2755 | - | (*timestamppb.Timestamp)(nil), // 33: google.protobuf.Timestamp | 2876 | + | (*MarkReadRequest)(nil), // 33: ermite.MarkReadRequest |
| 2756 | - | (MergeMode)(0), // 34: ermite.MergeMode | 2877 | + | (*MarkReadResponse)(nil), // 34: ermite.MarkReadResponse |
| 2757 | - | (*Commit)(nil), // 35: ermite.Commit | 2878 | + | (*timestamppb.Timestamp)(nil), // 35: google.protobuf.Timestamp |
| 2758 | - | (*DiffStats)(nil), // 36: ermite.DiffStats | 2879 | + | (MergeMode)(0), // 36: ermite.MergeMode |
| 2759 | - | (*Diff)(nil), // 37: ermite.Diff | 2880 | + | (*Commit)(nil), // 37: ermite.Commit |
| 2881 | + | (*DiffStats)(nil), // 38: ermite.DiffStats | |||
| 2882 | + | (*Diff)(nil), // 39: ermite.Diff | |||
| 2760 | } | 2883 | } | ||
| 2761 | var file_ermite_merge_request_proto_depIdxs = []int32{ | 2884 | var file_ermite_merge_request_proto_depIdxs = []int32{ | ||
| 2762 | 3, // 0: ermite.Mergeability.state:type_name -> ermite.MergeabilityState | 2885 | 3, // 0: ermite.Mergeability.state:type_name -> ermite.MergeabilityState | ||
| 2763 | - | 33, // 1: ermite.Mergeability.checked_at:type_name -> google.protobuf.Timestamp | 2886 | + | 35, // 1: ermite.Mergeability.checked_at:type_name -> google.protobuf.Timestamp |
| 2764 | - | 34, // 2: ermite.AutoMerge.mode:type_name -> ermite.MergeMode | 2887 | + | 36, // 2: ermite.AutoMerge.mode:type_name -> ermite.MergeMode |
| 2765 | - | 33, // 3: ermite.AutoMerge.enabled_at:type_name -> google.protobuf.Timestamp | 2888 | + | 35, // 3: ermite.AutoMerge.enabled_at:type_name -> google.protobuf.Timestamp |
| 2766 | 0, // 4: ermite.MergeRequest.state:type_name -> ermite.MergeRequestState | 2889 | 0, // 4: ermite.MergeRequest.state:type_name -> ermite.MergeRequestState | ||
| 2767 | - | 33, // 5: ermite.MergeRequest.created_at:type_name -> google.protobuf.Timestamp | 2890 | + | 35, // 5: ermite.MergeRequest.created_at:type_name -> google.protobuf.Timestamp |
| 2768 | - | 33, // 6: ermite.MergeRequest.updated_at:type_name -> google.protobuf.Timestamp | 2891 | + | 35, // 6: ermite.MergeRequest.updated_at:type_name -> google.protobuf.Timestamp |
| 2769 | - | 34, // 7: ermite.MergeRequest.merge_mode:type_name -> ermite.MergeMode | 2892 | + | 36, // 7: ermite.MergeRequest.merge_mode:type_name -> ermite.MergeMode |
| 2770 | 4, // 8: ermite.MergeRequest.mergeability:type_name -> ermite.Mergeability | 2893 | 4, // 8: ermite.MergeRequest.mergeability:type_name -> ermite.Mergeability | ||
| 2771 | 5, // 9: ermite.MergeRequest.auto_merge:type_name -> ermite.AutoMerge | 2894 | 5, // 9: ermite.MergeRequest.auto_merge:type_name -> ermite.AutoMerge | ||
| 2772 | 1, // 10: ermite.Comment.side:type_name -> ermite.DiffSide | 2895 | 1, // 10: ermite.Comment.side:type_name -> ermite.DiffSide | ||
| 2773 | - | 33, // 11: ermite.Comment.created_at:type_name -> google.protobuf.Timestamp | 2896 | + | 35, // 11: ermite.Comment.created_at:type_name -> google.protobuf.Timestamp |
| 2774 | 2, // 12: ermite.Comment.verdict:type_name -> ermite.Verdict | 2897 | 2, // 12: ermite.Comment.verdict:type_name -> ermite.Verdict | ||
| 2775 | - | 33, // 13: ermite.Comment.edited_at:type_name -> google.protobuf.Timestamp | 2898 | + | 35, // 13: ermite.Comment.edited_at:type_name -> google.protobuf.Timestamp |
| 2776 | 2, // 14: ermite.AuthorVerdict.verdict:type_name -> ermite.Verdict | 2899 | 2, // 14: ermite.AuthorVerdict.verdict:type_name -> ermite.Verdict | ||
| 2777 | - | 33, // 15: ermite.AuthorVerdict.created_at:type_name -> google.protobuf.Timestamp | 2900 | + | 35, // 15: ermite.AuthorVerdict.created_at:type_name -> google.protobuf.Timestamp |
| 2778 | 6, // 16: ermite.CreateMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | 2901 | 6, // 16: ermite.CreateMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | ||
| 2779 | 0, // 17: ermite.ListMergeRequestsRequest.state:type_name -> ermite.MergeRequestState | 2902 | 0, // 17: ermite.ListMergeRequestsRequest.state:type_name -> ermite.MergeRequestState | ||
| 2780 | 6, // 18: ermite.ListMergeRequestsResponse.merge_requests:type_name -> ermite.MergeRequest | 2903 | 6, // 18: ermite.ListMergeRequestsResponse.merge_requests:type_name -> ermite.MergeRequest | ||
| 2781 | 6, // 19: ermite.GetMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | 2904 | 6, // 19: ermite.GetMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | ||
| 2782 | - | 35, // 20: ermite.GetMergeRequestResponse.commits:type_name -> ermite.Commit | 2905 | + | 37, // 20: ermite.GetMergeRequestResponse.commits:type_name -> ermite.Commit |
| 2783 | - | 36, // 21: ermite.GetMergeRequestResponse.stats:type_name -> ermite.DiffStats | 2906 | + | 38, // 21: ermite.GetMergeRequestResponse.stats:type_name -> ermite.DiffStats |
| 2784 | - | 37, // 22: ermite.GetMergeRequestResponse.diff:type_name -> ermite.Diff | 2907 | + | 39, // 22: ermite.GetMergeRequestResponse.diff:type_name -> ermite.Diff |
| 2785 | 7, // 23: ermite.GetMergeRequestResponse.comments:type_name -> ermite.Comment | 2908 | 7, // 23: ermite.GetMergeRequestResponse.comments:type_name -> ermite.Comment | ||
| 2786 | 8, // 24: ermite.GetMergeRequestResponse.verdicts:type_name -> ermite.AuthorVerdict | 2909 | 8, // 24: ermite.GetMergeRequestResponse.verdicts:type_name -> ermite.AuthorVerdict | ||
| 2787 | 1, // 25: ermite.AddCommentRequest.side:type_name -> ermite.DiffSide | 2910 | 1, // 25: ermite.AddCommentRequest.side:type_name -> ermite.DiffSide | ||
| @@ -2791,40 +2914,43 @@ var file_ermite_merge_request_proto_depIdxs = []int32{ | |||||
| 2791 | 7, // 29: ermite.DeleteCommentResponse.comment:type_name -> ermite.Comment | 2914 | 7, // 29: ermite.DeleteCommentResponse.comment:type_name -> ermite.Comment | ||
| 2792 | 7, // 30: ermite.ResolveCommentResponse.comment:type_name -> ermite.Comment | 2915 | 7, // 30: ermite.ResolveCommentResponse.comment:type_name -> ermite.Comment | ||
| 2793 | 6, // 31: ermite.CloseMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | 2916 | 6, // 31: ermite.CloseMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | ||
| 2794 | - | 34, // 32: ermite.MergeMergeRequestRequest.mode:type_name -> ermite.MergeMode | 2917 | + | 6, // 32: ermite.MarkReadyResponse.merge_request:type_name -> ermite.MergeRequest |
| 2795 | - | 6, // 33: ermite.MergeMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest | 2918 | + | 36, // 33: ermite.MergeMergeRequestRequest.mode:type_name -> ermite.MergeMode |
| 2796 | - | 34, // 34: ermite.EnableAutoMergeRequest.mode:type_name -> ermite.MergeMode | 2919 | + | 6, // 34: ermite.MergeMergeRequestResponse.merge_request:type_name -> ermite.MergeRequest |
| 2797 | - | 6, // 35: ermite.EnableAutoMergeResponse.merge_request:type_name -> ermite.MergeRequest | 2920 | + | 36, // 35: ermite.EnableAutoMergeRequest.mode:type_name -> ermite.MergeMode |
| 2798 | - | 6, // 36: ermite.CancelAutoMergeResponse.merge_request:type_name -> ermite.MergeRequest | 2921 | + | 6, // 36: ermite.EnableAutoMergeResponse.merge_request:type_name -> ermite.MergeRequest |
| 2799 | - | 9, // 37: ermite.MergeRequestService.CreateMergeRequest:input_type -> ermite.CreateMergeRequestRequest | 2922 | + | 6, // 37: ermite.CancelAutoMergeResponse.merge_request:type_name -> ermite.MergeRequest |
| 2800 | - | 11, // 38: ermite.MergeRequestService.ListMergeRequests:input_type -> ermite.ListMergeRequestsRequest | 2923 | + | 9, // 38: ermite.MergeRequestService.CreateMergeRequest:input_type -> ermite.CreateMergeRequestRequest |
| 2801 | - | 13, // 39: ermite.MergeRequestService.GetMergeRequest:input_type -> ermite.GetMergeRequestRequest | 2924 | + | 11, // 39: ermite.MergeRequestService.ListMergeRequests:input_type -> ermite.ListMergeRequestsRequest |
| 2802 | - | 15, // 40: ermite.MergeRequestService.AddComment:input_type -> ermite.AddCommentRequest | 2925 | + | 13, // 40: ermite.MergeRequestService.GetMergeRequest:input_type -> ermite.GetMergeRequestRequest |
| 2803 | - | 17, // 41: ermite.MergeRequestService.EditComment:input_type -> ermite.EditCommentRequest | 2926 | + | 15, // 41: ermite.MergeRequestService.AddComment:input_type -> ermite.AddCommentRequest |
| 2804 | - | 19, // 42: ermite.MergeRequestService.DeleteComment:input_type -> ermite.DeleteCommentRequest | 2927 | + | 17, // 42: ermite.MergeRequestService.EditComment:input_type -> ermite.EditCommentRequest |
| 2805 | - | 21, // 43: ermite.MergeRequestService.ResolveComment:input_type -> ermite.ResolveCommentRequest | 2928 | + | 19, // 43: ermite.MergeRequestService.DeleteComment:input_type -> ermite.DeleteCommentRequest |
| 2806 | - | 23, // 44: ermite.MergeRequestService.CloseMergeRequest:input_type -> ermite.CloseMergeRequestRequest | 2929 | + | 21, // 44: ermite.MergeRequestService.ResolveComment:input_type -> ermite.ResolveCommentRequest |
| 2807 | - | 25, // 45: ermite.MergeRequestService.MergeMergeRequest:input_type -> ermite.MergeMergeRequestRequest | 2930 | + | 23, // 45: ermite.MergeRequestService.CloseMergeRequest:input_type -> ermite.CloseMergeRequestRequest |
| 2808 | - | 27, // 46: ermite.MergeRequestService.EnableAutoMerge:input_type -> ermite.EnableAutoMergeRequest | 2931 | + | 25, // 46: ermite.MergeRequestService.MarkReady:input_type -> ermite.MarkReadyRequest |
| 2809 | - | 29, // 47: ermite.MergeRequestService.CancelAutoMerge:input_type -> ermite.CancelAutoMergeRequest | 2932 | + | 27, // 47: ermite.MergeRequestService.MergeMergeRequest:input_type -> ermite.MergeMergeRequestRequest |
| 2810 | - | 31, // 48: ermite.MergeRequestService.MarkRead:input_type -> ermite.MarkReadRequest | 2933 | + | 29, // 48: ermite.MergeRequestService.EnableAutoMerge:input_type -> ermite.EnableAutoMergeRequest |
| 2811 | - | 10, // 49: ermite.MergeRequestService.CreateMergeRequest:output_type -> ermite.CreateMergeRequestResponse | 2934 | + | 31, // 49: ermite.MergeRequestService.CancelAutoMerge:input_type -> ermite.CancelAutoMergeRequest |
| 2812 | - | 12, // 50: ermite.MergeRequestService.ListMergeRequests:output_type -> ermite.ListMergeRequestsResponse | 2935 | + | 33, // 50: ermite.MergeRequestService.MarkRead:input_type -> ermite.MarkReadRequest |
| 2813 | - | 14, // 51: ermite.MergeRequestService.GetMergeRequest:output_type -> ermite.GetMergeRequestResponse | 2936 | + | 10, // 51: ermite.MergeRequestService.CreateMergeRequest:output_type -> ermite.CreateMergeRequestResponse |
| 2814 | - | 16, // 52: ermite.MergeRequestService.AddComment:output_type -> ermite.AddCommentResponse | 2937 | + | 12, // 52: ermite.MergeRequestService.ListMergeRequests:output_type -> ermite.ListMergeRequestsResponse |
| 2815 | - | 18, // 53: ermite.MergeRequestService.EditComment:output_type -> ermite.EditCommentResponse | 2938 | + | 14, // 53: ermite.MergeRequestService.GetMergeRequest:output_type -> ermite.GetMergeRequestResponse |
| 2816 | - | 20, // 54: ermite.MergeRequestService.DeleteComment:output_type -> ermite.DeleteCommentResponse | 2939 | + | 16, // 54: ermite.MergeRequestService.AddComment:output_type -> ermite.AddCommentResponse |
| 2817 | - | 22, // 55: ermite.MergeRequestService.ResolveComment:output_type -> ermite.ResolveCommentResponse | 2940 | + | 18, // 55: ermite.MergeRequestService.EditComment:output_type -> ermite.EditCommentResponse |
| 2818 | - | 24, // 56: ermite.MergeRequestService.CloseMergeRequest:output_type -> ermite.CloseMergeRequestResponse | 2941 | + | 20, // 56: ermite.MergeRequestService.DeleteComment:output_type -> ermite.DeleteCommentResponse |
| 2819 | - | 26, // 57: ermite.MergeRequestService.MergeMergeRequest:output_type -> ermite.MergeMergeRequestResponse | 2942 | + | 22, // 57: ermite.MergeRequestService.ResolveComment:output_type -> ermite.ResolveCommentResponse |
| 2820 | - | 28, // 58: ermite.MergeRequestService.EnableAutoMerge:output_type -> ermite.EnableAutoMergeResponse | 2943 | + | 24, // 58: ermite.MergeRequestService.CloseMergeRequest:output_type -> ermite.CloseMergeRequestResponse |
| 2821 | - | 30, // 59: ermite.MergeRequestService.CancelAutoMerge:output_type -> ermite.CancelAutoMergeResponse | 2944 | + | 26, // 59: ermite.MergeRequestService.MarkReady:output_type -> ermite.MarkReadyResponse |
| 2822 | - | 32, // 60: ermite.MergeRequestService.MarkRead:output_type -> ermite.MarkReadResponse | 2945 | + | 28, // 60: ermite.MergeRequestService.MergeMergeRequest:output_type -> ermite.MergeMergeRequestResponse |
| 2823 | - | 49, // [49:61] is the sub-list for method output_type | 2946 | + | 30, // 61: ermite.MergeRequestService.EnableAutoMerge:output_type -> ermite.EnableAutoMergeResponse |
| 2824 | - | 37, // [37:49] is the sub-list for method input_type | 2947 | + | 32, // 62: ermite.MergeRequestService.CancelAutoMerge:output_type -> ermite.CancelAutoMergeResponse |
| 2825 | - | 37, // [37:37] is the sub-list for extension type_name | 2948 | + | 34, // 63: ermite.MergeRequestService.MarkRead:output_type -> ermite.MarkReadResponse |
| 2826 | - | 37, // [37:37] is the sub-list for extension extendee | 2949 | + | 51, // [51:64] is the sub-list for method output_type |
| 2827 | - | 0, // [0:37] is the sub-list for field type_name | 2950 | + | 38, // [38:51] is the sub-list for method input_type |
| 2951 | + | 38, // [38:38] is the sub-list for extension type_name | |||
| 2952 | + | 38, // [38:38] is the sub-list for extension extendee | |||
| 2953 | + | 0, // [0:38] is the sub-list for field type_name | |||
| 2828 | } | 2954 | } | ||
| 2829 | 2955 | ||||
| 2830 | func init() { file_ermite_merge_request_proto_init() } | 2956 | func init() { file_ermite_merge_request_proto_init() } | ||
| @@ -2840,7 +2966,7 @@ func file_ermite_merge_request_proto_init() { | |||||
| 2840 | GoPackagePath: reflect.TypeOf(x{}).PkgPath(), | 2966 | GoPackagePath: reflect.TypeOf(x{}).PkgPath(), | ||
| 2841 | RawDescriptor: unsafe.Slice(unsafe.StringData(file_ermite_merge_request_proto_rawDesc), len(file_ermite_merge_request_proto_rawDesc)), | 2967 | RawDescriptor: unsafe.Slice(unsafe.StringData(file_ermite_merge_request_proto_rawDesc), len(file_ermite_merge_request_proto_rawDesc)), | ||
| 2842 | NumEnums: 4, | 2968 | NumEnums: 4, | ||
| 2843 | - | NumMessages: 29, | 2969 | + | NumMessages: 31, |
| 2844 | NumExtensions: 0, | 2970 | NumExtensions: 0, | ||
| 2845 | NumServices: 1, | 2971 | NumServices: 1, | ||
| 2846 | }, | 2972 | }, | ||
M gen/ermite/repo.pb.go +6 -19 generated file: collapsed
M gen/ermite/token.pb.go +10 -3 generated file: collapsed
M gen_test.go +2 -3
| @@ -254,10 +254,9 @@ func TestMergeRequestEventRoundTrip(t *testing.T) { | |||
| 254 | 254 | req := &ermite.UpdateRepoRequest{ | |
| 255 | 255 | Repo: "ermite", | |
| 256 | 256 | Settings: &ermite.RepoSettings{ | |
| 257 | - | AllowedMergeModes: []ermite.MergeMode{ermite.MergeMode_MERGE_MODE_SQUASH}, | |
| 258 | - | FailingChecksBlock: true, | |
| 257 | + | AllowedMergeModes: []ermite.MergeMode{ermite.MergeMode_MERGE_MODE_SQUASH}, | |
| 259 | 258 | }, | |
| 260 | - | UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"settings.allowed_merge_modes", "settings.failing_checks_block"}}, | |
| 259 | + | UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"settings.allowed_merge_modes"}}, | |
| 261 | 260 | } | |
| 262 | 261 | if got := req.GetSettings().GetAllowedMergeModes(); len(got) != 1 || got[0] != ermite.MergeMode_MERGE_MODE_SQUASH { | |
| 263 | 262 | t.Errorf("modes = %v", got) | |
| @@ -254,10 +254,9 @@ func TestMergeRequestEventRoundTrip(t *testing.T) { | |||||
| 254 | req := &ermite.UpdateRepoRequest{ | 254 | req := &ermite.UpdateRepoRequest{ | ||
| 255 | Repo: "ermite", | 255 | Repo: "ermite", | ||
| 256 | Settings: &ermite.RepoSettings{ | 256 | Settings: &ermite.RepoSettings{ | ||
| 257 | - | AllowedMergeModes: []ermite.MergeMode{ermite.MergeMode_MERGE_MODE_SQUASH}, | 257 | + | AllowedMergeModes: []ermite.MergeMode{ermite.MergeMode_MERGE_MODE_SQUASH}, |
| 258 | - | FailingChecksBlock: true, | |||
| 259 | }, | 258 | }, | ||
| 260 | - | UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"settings.allowed_merge_modes", "settings.failing_checks_block"}}, | 259 | + | UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"settings.allowed_merge_modes"}}, |
| 261 | } | 260 | } | ||
| 262 | if got := req.GetSettings().GetAllowedMergeModes(); len(got) != 1 || got[0] != ermite.MergeMode_MERGE_MODE_SQUASH { | 261 | if got := req.GetSettings().GetAllowedMergeModes(); len(got) != 1 || got[0] != ermite.MergeMode_MERGE_MODE_SQUASH { | ||
| 263 | t.Errorf("modes = %v", got) | 262 | t.Errorf("modes = %v", got) | ||
M proto/ermite/merge_request.proto +35 -6
| @@ -300,7 +300,16 @@ service MergeRequestService { | |||
| 300 | 300 | // the mr:write scope. Fails with failed_precondition if the merge request | |
| 301 | 301 | // is not open. A closed merge request cannot be reopened: open a new one. | |
| 302 | 302 | rpc CloseMergeRequest(CloseMergeRequestRequest) returns (CloseMergeRequestResponse); | |
| 303 | - | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope. | |
| 303 | + | // MarkReady removes the draft prefix ("WIP:" or "[WIP]") from the title so | |
| 304 | + | // the merge request can be merged. Needs the mr:write scope. Fails with | |
| 305 | + | // failed_precondition if the merge request is not open or is not a draft. | |
| 306 | + | // Publishes no event: there is none for a change of title. Needs the | |
| 307 | + | // "merge_requests.ready" feature. | |
| 308 | + | rpc MarkReady(MarkReadyRequest) returns (MarkReadyResponse); | |
| 309 | + | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope, | |
| 310 | + | // which merges only when the checks on the head allow it: none failed and | |
| 311 | + | // none queued or running (a head with no checks may be merged; success, | |
| 312 | + | // skipped and neutral pass). The mr:force-merge scope allows ignore_checks. | |
| 304 | 313 | // The caller passes the head it reviewed: the server merges only if the | |
| 305 | 314 | // source branch still points to it, so a push between review and merge is | |
| 306 | 315 | // never merged unseen. Fails with invalid_argument if head_id is empty or | |
| @@ -310,17 +319,17 @@ service MergeRequestService { | |||
| 310 | 319 | // ancestor of the head (rebase and push again, or merge with squash or | |
| 311 | 320 | // merge commit), if the mode is squash or merge commit and the head | |
| 312 | 321 | // conflicts with the target or shares no history with it (rebase and push | |
| 313 | - | // again), if the mode is not allowed by RepoSettings, or if a check fails | |
| 314 | - | // and RepoSettings.failing_checks_block is set. Merges of one | |
| 322 | + | // again), if the mode is not allowed by RepoSettings, or if a check failed or | |
| 323 | + | // has not finished, unless ignore_checks is set. Merges of one | |
| 315 | 324 | // repository run one at a time. Repeating a call that succeeded fails with | |
| 316 | 325 | // failed_precondition (not open). On success the server publishes | |
| 317 | 326 | // MergeRequestMerged then Pushed for the target branch. | |
| 318 | 327 | rpc MergeMergeRequest(MergeMergeRequestRequest) returns (MergeMergeRequestResponse); | |
| 319 | 328 | // EnableAutoMerge asks the server to merge an open merge request by itself | |
| 320 | 329 | // once at least one check passed on its head, every run created on that head | |
| 321 | - | // is complete, and the merge would be accepted whatever | |
| 322 | - | // RepoSettings.failing_checks_block says. Needs the mr:merge scope and, for a | |
| 323 | - | // token limited to branches, write access to the target branch | |
| 330 | + | // is complete, and no check failed. It does not take ignore_checks. Needs | |
| 331 | + | // the mr:merge scope and, for a token limited to branches, write access to | |
| 332 | + | // the target branch | |
| 324 | 333 | // (permission_denied otherwise). The server records the caller, the mode and | |
| 325 | 334 | // the head the caller saw; it merges as the caller, after resolving the caller | |
| 326 | 335 | // again, and cancels the auto-merge if the caller can no longer merge, if the | |
| @@ -549,6 +558,21 @@ message CloseMergeRequestResponse { | |||
| 549 | 558 | MergeRequest merge_request = 1; | |
| 550 | 559 | } | |
| 551 | 560 | ||
| 561 | + | // MarkReadyRequest names the draft merge request to mark ready. | |
| 562 | + | message MarkReadyRequest { | |
| 563 | + | // Repo is the repository name. | |
| 564 | + | string repo = 1; | |
| 565 | + | // Number is the merge request number. | |
| 566 | + | int64 number = 2; | |
| 567 | + | } | |
| 568 | + | ||
| 569 | + | // MarkReadyResponse holds the merge request after marking it ready. | |
| 570 | + | message MarkReadyResponse { | |
| 571 | + | // MergeRequest is the merge request with its title stripped of the draft | |
| 572 | + | // prefix. | |
| 573 | + | MergeRequest merge_request = 1; | |
| 574 | + | } | |
| 575 | + | ||
| 552 | 576 | // MergeMergeRequestRequest describes the merge to perform. | |
| 553 | 577 | message MergeMergeRequestRequest { | |
| 554 | 578 | // Repo is the repository name. | |
| @@ -568,6 +592,11 @@ message MergeMergeRequestRequest { | |||
| 568 | 592 | // request. Servers without the "merge_requests.delete_branch" feature ignore | |
| 569 | 593 | // it. | |
| 570 | 594 | bool delete_source_branch = 5; | |
| 595 | + | // IgnoreChecks merges whatever the checks say. Needs the mr:force-merge | |
| 596 | + | // scope (permission_denied otherwise). Servers without the | |
| 597 | + | // "merge_requests.ignore_checks" feature ignore it: check the feature | |
| 598 | + | // before setting it. | |
| 599 | + | bool ignore_checks = 6; | |
| 571 | 600 | } | |
| 572 | 601 | ||
| 573 | 602 | // MergeMergeRequestResponse holds the merged merge request. | |
| @@ -300,7 +300,16 @@ service MergeRequestService { | |||||
| 300 | // the mr:write scope. Fails with failed_precondition if the merge request | 300 | // the mr:write scope. Fails with failed_precondition if the merge request | ||
| 301 | // is not open. A closed merge request cannot be reopened: open a new one. | 301 | // is not open. A closed merge request cannot be reopened: open a new one. | ||
| 302 | rpc CloseMergeRequest(CloseMergeRequestRequest) returns (CloseMergeRequestResponse); | 302 | rpc CloseMergeRequest(CloseMergeRequestRequest) returns (CloseMergeRequestResponse); | ||
| 303 | - | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope. | 303 | + | // MarkReady removes the draft prefix ("WIP:" or "[WIP]") from the title so |
| 304 | + | // the merge request can be merged. Needs the mr:write scope. Fails with | |||
| 305 | + | // failed_precondition if the merge request is not open or is not a draft. | |||
| 306 | + | // Publishes no event: there is none for a change of title. Needs the | |||
| 307 | + | // "merge_requests.ready" feature. | |||
| 308 | + | rpc MarkReady(MarkReadyRequest) returns (MarkReadyResponse); | |||
| 309 | + | // MergeMergeRequest merges an open merge request. Needs the mr:merge scope, | |||
| 310 | + | // which merges only when the checks on the head allow it: none failed and | |||
| 311 | + | // none queued or running (a head with no checks may be merged; success, | |||
| 312 | + | // skipped and neutral pass). The mr:force-merge scope allows ignore_checks. | |||
| 304 | // The caller passes the head it reviewed: the server merges only if the | 313 | // The caller passes the head it reviewed: the server merges only if the | ||
| 305 | // source branch still points to it, so a push between review and merge is | 314 | // source branch still points to it, so a push between review and merge is | ||
| 306 | // never merged unseen. Fails with invalid_argument if head_id is empty or | 315 | // never merged unseen. Fails with invalid_argument if head_id is empty or | ||
| @@ -310,17 +319,17 @@ service MergeRequestService { | |||||
| 310 | // ancestor of the head (rebase and push again, or merge with squash or | 319 | // ancestor of the head (rebase and push again, or merge with squash or | ||
| 311 | // merge commit), if the mode is squash or merge commit and the head | 320 | // merge commit), if the mode is squash or merge commit and the head | ||
| 312 | // conflicts with the target or shares no history with it (rebase and push | 321 | // conflicts with the target or shares no history with it (rebase and push | ||
| 313 | - | // again), if the mode is not allowed by RepoSettings, or if a check fails | 322 | + | // again), if the mode is not allowed by RepoSettings, or if a check failed or |
| 314 | - | // and RepoSettings.failing_checks_block is set. Merges of one | 323 | + | // has not finished, unless ignore_checks is set. Merges of one |
| 315 | // repository run one at a time. Repeating a call that succeeded fails with | 324 | // repository run one at a time. Repeating a call that succeeded fails with | ||
| 316 | // failed_precondition (not open). On success the server publishes | 325 | // failed_precondition (not open). On success the server publishes | ||
| 317 | // MergeRequestMerged then Pushed for the target branch. | 326 | // MergeRequestMerged then Pushed for the target branch. | ||
| 318 | rpc MergeMergeRequest(MergeMergeRequestRequest) returns (MergeMergeRequestResponse); | 327 | rpc MergeMergeRequest(MergeMergeRequestRequest) returns (MergeMergeRequestResponse); | ||
| 319 | // EnableAutoMerge asks the server to merge an open merge request by itself | 328 | // EnableAutoMerge asks the server to merge an open merge request by itself | ||
| 320 | // once at least one check passed on its head, every run created on that head | 329 | // once at least one check passed on its head, every run created on that head | ||
| 321 | - | // is complete, and the merge would be accepted whatever | 330 | + | // is complete, and no check failed. It does not take ignore_checks. Needs |
| 322 | - | // RepoSettings.failing_checks_block says. Needs the mr:merge scope and, for a | 331 | + | // the mr:merge scope and, for a token limited to branches, write access to |
| 323 | - | // token limited to branches, write access to the target branch | 332 | + | // the target branch |
| 324 | // (permission_denied otherwise). The server records the caller, the mode and | 333 | // (permission_denied otherwise). The server records the caller, the mode and | ||
| 325 | // the head the caller saw; it merges as the caller, after resolving the caller | 334 | // the head the caller saw; it merges as the caller, after resolving the caller | ||
| 326 | // again, and cancels the auto-merge if the caller can no longer merge, if the | 335 | // again, and cancels the auto-merge if the caller can no longer merge, if the | ||
| @@ -549,6 +558,21 @@ message CloseMergeRequestResponse { | |||||
| 549 | MergeRequest merge_request = 1; | 558 | MergeRequest merge_request = 1; | ||
| 550 | } | 559 | } | ||
| 551 | 560 | ||||
| 561 | + | // MarkReadyRequest names the draft merge request to mark ready. | |||
| 562 | + | message MarkReadyRequest { | |||
| 563 | + | // Repo is the repository name. | |||
| 564 | + | string repo = 1; | |||
| 565 | + | // Number is the merge request number. | |||
| 566 | + | int64 number = 2; | |||
| 567 | + | } | |||
| 568 | + | ||||
| 569 | + | // MarkReadyResponse holds the merge request after marking it ready. | |||
| 570 | + | message MarkReadyResponse { | |||
| 571 | + | // MergeRequest is the merge request with its title stripped of the draft | |||
| 572 | + | // prefix. | |||
| 573 | + | MergeRequest merge_request = 1; | |||
| 574 | + | } | |||
| 575 | + | ||||
| 552 | // MergeMergeRequestRequest describes the merge to perform. | 576 | // MergeMergeRequestRequest describes the merge to perform. | ||
| 553 | message MergeMergeRequestRequest { | 577 | message MergeMergeRequestRequest { | ||
| 554 | // Repo is the repository name. | 578 | // Repo is the repository name. | ||
| @@ -568,6 +592,11 @@ message MergeMergeRequestRequest { | |||||
| 568 | // request. Servers without the "merge_requests.delete_branch" feature ignore | 592 | // request. Servers without the "merge_requests.delete_branch" feature ignore | ||
| 569 | // it. | 593 | // it. | ||
| 570 | bool delete_source_branch = 5; | 594 | bool delete_source_branch = 5; | ||
| 595 | + | // IgnoreChecks merges whatever the checks say. Needs the mr:force-merge | |||
| 596 | + | // scope (permission_denied otherwise). Servers without the | |||
| 597 | + | // "merge_requests.ignore_checks" feature ignore it: check the feature | |||
| 598 | + | // before setting it. | |||
| 599 | + | bool ignore_checks = 6; | |||
| 571 | } | 600 | } | ||
| 572 | 601 | ||||
| 573 | // MergeMergeRequestResponse holds the merged merge request. | 602 | // MergeMergeRequestResponse holds the merged merge request. | ||
M proto/ermite/repo.proto +6 -8
| @@ -35,16 +35,14 @@ enum IssuesMode { | |||
| 35 | 35 | // RepoSettings are the settings of a repository that govern its merge | |
| 36 | 36 | // requests and issues. | |
| 37 | 37 | message RepoSettings { | |
| 38 | + | reserved 2; | |
| 39 | + | reserved "failing_checks_block"; | |
| 40 | + | ||
| 38 | 41 | // AllowedMergeModes are the modes with which a merge request of the | |
| 39 | 42 | // repository may be merged. It is never empty in a response and has no | |
| 40 | 43 | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | |
| 41 | 44 | // rejected. | |
| 42 | 45 | repeated MergeMode allowed_merge_modes = 1; | |
| 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 | |
| 45 | - | // explicitly, so a later change of the server default never alters an | |
| 46 | - | // existing repository. | |
| 47 | - | bool failing_checks_block = 2; | |
| 48 | 46 | // Issues is the issue participation mode of the repository. | |
| 49 | 47 | IssuesMode issues = 3; | |
| 50 | 48 | // AllowAutoMerge says whether auto-merge can be enabled on the merge requests | |
| @@ -170,9 +168,9 @@ message UpdateRepoRequest { | |||
| 170 | 168 | // the call fails with failed_precondition. | |
| 171 | 169 | string default_branch = 4; | |
| 172 | 170 | // UpdateMask lists the fields to change: "description", "visibility", | |
| 173 | - | // "default_branch", "topics", "settings.allowed_merge_modes", | |
| 174 | - | // "settings.failing_checks_block" and/or "settings.allow_auto_merge". | |
| 175 | - | // "settings" stands for the three merge settings paths. It must not be empty unless issues is set. Other paths are | |
| 171 | + | // "default_branch", "topics", "settings.allowed_merge_modes" and/or | |
| 172 | + | // "settings.allow_auto_merge". "settings" stands for the two merge settings | |
| 173 | + | // paths. It must not be empty unless issues is set. Other paths are | |
| 176 | 174 | // invalid_argument, including "settings.issues" and "issues": the issues | |
| 177 | 175 | // field is applied outside the mask. | |
| 178 | 176 | google.protobuf.FieldMask update_mask = 5; | |
| @@ -35,16 +35,14 @@ enum IssuesMode { | |||||
| 35 | // RepoSettings are the settings of a repository that govern its merge | 35 | // RepoSettings are the settings of a repository that govern its merge | ||
| 36 | // requests and issues. | 36 | // requests and issues. | ||
| 37 | message RepoSettings { | 37 | message RepoSettings { | ||
| 38 | + | reserved 2; | |||
| 39 | + | reserved "failing_checks_block"; | |||
| 40 | + | ||||
| 38 | // AllowedMergeModes are the modes with which a merge request of the | 41 | // 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 | 42 | // repository may be merged. It is never empty in a response and has no | ||
| 40 | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | 43 | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | ||
| 41 | // rejected. | 44 | // rejected. | ||
| 42 | repeated MergeMode allowed_merge_modes = 1; | 45 | repeated MergeMode allowed_merge_modes = 1; | ||
| 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 | |||
| 45 | - | // explicitly, so a later change of the server default never alters an | |||
| 46 | - | // existing repository. | |||
| 47 | - | bool failing_checks_block = 2; | |||
| 48 | // Issues is the issue participation mode of the repository. | 46 | // Issues is the issue participation mode of the repository. | ||
| 49 | IssuesMode issues = 3; | 47 | IssuesMode issues = 3; | ||
| 50 | // AllowAutoMerge says whether auto-merge can be enabled on the merge requests | 48 | // AllowAutoMerge says whether auto-merge can be enabled on the merge requests | ||
| @@ -170,9 +168,9 @@ message UpdateRepoRequest { | |||||
| 170 | // the call fails with failed_precondition. | 168 | // the call fails with failed_precondition. | ||
| 171 | string default_branch = 4; | 169 | string default_branch = 4; | ||
| 172 | // UpdateMask lists the fields to change: "description", "visibility", | 170 | // UpdateMask lists the fields to change: "description", "visibility", | ||
| 173 | - | // "default_branch", "topics", "settings.allowed_merge_modes", | 171 | + | // "default_branch", "topics", "settings.allowed_merge_modes" and/or |
| 174 | - | // "settings.failing_checks_block" and/or "settings.allow_auto_merge". | 172 | + | // "settings.allow_auto_merge". "settings" stands for the two merge settings |
| 175 | - | // "settings" stands for the three merge settings paths. It must not be empty unless issues is set. Other paths are | 173 | + | // paths. It must not be empty unless issues is set. Other paths are |
| 176 | // invalid_argument, including "settings.issues" and "issues": the issues | 174 | // invalid_argument, including "settings.issues" and "issues": the issues | ||
| 177 | // field is applied outside the mask. | 175 | // field is applied outside the mask. | ||
| 178 | google.protobuf.FieldMask update_mask = 5; | 176 | google.protobuf.FieldMask update_mask = 5; | ||
M proto/ermite/token.proto +5 -1
| @@ -23,7 +23,8 @@ enum Scope { | |||
| 23 | 23 | // SCOPE_MR_WRITE allows creating, commenting on and closing merge requests. | |
| 24 | 24 | // Wire name: mr:write. | |
| 25 | 25 | SCOPE_MR_WRITE = 4; | |
| 26 | - | // SCOPE_MR_MERGE allows merging merge requests. Wire name: mr:merge. | |
| 26 | + | // SCOPE_MR_MERGE allows merging merge requests whose checks allow it. Wire name: | |
| 27 | + | // mr:merge. | |
| 27 | 28 | SCOPE_MR_MERGE = 5; | |
| 28 | 29 | // SCOPE_CI_WRITE allows re-running or cancelling CI runs. Wire name: | |
| 29 | 30 | // ci:write. | |
| @@ -45,6 +46,9 @@ enum Scope { | |||
| 45 | 46 | // SCOPE_ISSUE_WRITE allows creating, commenting on, closing and reopening | |
| 46 | 47 | // issues. Wire name: issue:write. | |
| 47 | 48 | SCOPE_ISSUE_WRITE = 11; | |
| 49 | + | // SCOPE_MR_FORCE_MERGE allows merging a merge request whatever its checks | |
| 50 | + | // say (MergeMergeRequestRequest.ignore_checks). Wire name: mr:force-merge. | |
| 51 | + | SCOPE_MR_FORCE_MERGE = 12; | |
| 48 | 52 | } | |
| 49 | 53 | ||
| 50 | 54 | // Token describes a stored token. It never contains the secret nor its hash. | |
| @@ -23,7 +23,8 @@ enum Scope { | |||||
| 23 | // SCOPE_MR_WRITE allows creating, commenting on and closing merge requests. | 23 | // SCOPE_MR_WRITE allows creating, commenting on and closing merge requests. | ||
| 24 | // Wire name: mr:write. | 24 | // Wire name: mr:write. | ||
| 25 | SCOPE_MR_WRITE = 4; | 25 | SCOPE_MR_WRITE = 4; | ||
| 26 | - | // SCOPE_MR_MERGE allows merging merge requests. Wire name: mr:merge. | 26 | + | // SCOPE_MR_MERGE allows merging merge requests whose checks allow it. Wire name: |
| 27 | + | // mr:merge. | |||
| 27 | SCOPE_MR_MERGE = 5; | 28 | SCOPE_MR_MERGE = 5; | ||
| 28 | // SCOPE_CI_WRITE allows re-running or cancelling CI runs. Wire name: | 29 | // SCOPE_CI_WRITE allows re-running or cancelling CI runs. Wire name: | ||
| 29 | // ci:write. | 30 | // ci:write. | ||
| @@ -45,6 +46,9 @@ enum Scope { | |||||
| 45 | // SCOPE_ISSUE_WRITE allows creating, commenting on, closing and reopening | 46 | // SCOPE_ISSUE_WRITE allows creating, commenting on, closing and reopening | ||
| 46 | // issues. Wire name: issue:write. | 47 | // issues. Wire name: issue:write. | ||
| 47 | SCOPE_ISSUE_WRITE = 11; | 48 | SCOPE_ISSUE_WRITE = 11; | ||
| 49 | + | // SCOPE_MR_FORCE_MERGE allows merging a merge request whatever its checks | |||
| 50 | + | // say (MergeMergeRequestRequest.ignore_checks). Wire name: mr:force-merge. | |||
| 51 | + | SCOPE_MR_FORCE_MERGE = 12; | |||
| 48 | } | 52 | } | ||
| 49 | 53 | ||||
| 50 | // Token describes a stored token. It never contains the secret nor its hash. | 54 | // Token describes a stored token. It never contains the secret nor its hash. | ||