diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-03-07 10:52:22 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-03-07 11:08:34 +0300 |
| commit | 151bdfd96e7baddfbbcc0eb43a7419358aecd34d (patch) | |
| tree | bc3d5e087d6c376986cf6fe5bd7c312314d0764e /proto/operations.proto | |
| parent | 9aa0347a23179d34af17f4f49720df83955c4f00 (diff) | |
proto: Deprecate PreReceiveError field in UserMergeBranchResponse
With e542a7d87 (operations: Implement rich errors for UserMergeBranch
access checks, 2021-08-30) we have introduced the ode to return proper
errors when access checks failed via gRPC's rich error model. The
feature flag has been remove with a23b34894 (operations: Enable use of
detailed errors for UserMergeBranch, 2022-02-16) , which means that we
don't ever set the `PreReceiveError` field of the
UserMergeBranchResponse message anymore.
Deprecate the field such that we can eventually remove it.
Changelog: deprecated
Diffstat (limited to 'proto/operations.proto')
| -rw-r--r-- | proto/operations.proto | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/proto/operations.proto b/proto/operations.proto index 277754dfe..b0704d75f 100644 --- a/proto/operations.proto +++ b/proto/operations.proto @@ -252,7 +252,9 @@ message UserMergeBranchResponse { // Second message // If set, the merge has been applied to the branch. OperationBranchUpdate branch_update = 3; - string pre_receive_error = 4; + // PreReceiveError is never set. Instead, we return a proper gRPC error with + // UserMergeBranchError details set to an AccessCheckError. + string pre_receive_error = 4 [deprecated=true]; } // UserMergeBranchError includes error descriptions which may be set as error |