Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2022-06-09 09:28:18 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-06-09 09:43:22 +0300
commitc9d246d1ba1fbe194c2b3c45470094d9fe028896 (patch)
treedef5b9163939ccdbc1efdbe7b051ae06cd33b64d /proto/operations.proto
parentfe9120118439ddd012a7b0d5b92859066cb72e82 (diff)
operations: Remove deprecated PreReceiveError field from UserMergeToRef
The `PreReceiveError` field of the `UserMergeToRef` response has been deprecated in 9aa0347a2 (proto: Deprecate PreReceiveError field in UserMergeToRefResponse, 2022-03-07) and is never set anymore. Let's remove it.
Diffstat (limited to 'proto/operations.proto')
-rw-r--r--proto/operations.proto8
1 files changed, 5 insertions, 3 deletions
diff --git a/proto/operations.proto b/proto/operations.proto
index 36830cc57..4a763d31a 100644
--- a/proto/operations.proto
+++ b/proto/operations.proto
@@ -377,9 +377,11 @@ message UserMergeToRefRequest {
message UserMergeToRefResponse {
// commit_id is the object ID of the computed merge commit.
string commit_id = 1;
- // PreReceiveError is never set because this RPC does not perform
- // authentication via `/internal/allowed`.
- string pre_receive_error = 2 [deprecated=true];
+
+ // PreReceiveError had never been set because this RPC does not perform authentication via
+ // `/internal/allowed`. This field was thus removed without replacement.
+ reserved "pre_receive_error";
+ reserved 2;
}
// OperationBranchUpdate contains the details of a branch update.