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:
authorJames Liu <jliu@gitlab.com>2023-10-09 05:57:55 +0300
committerJames Liu <jliu@gitlab.com>2023-10-12 08:17:04 +0300
commit0b63722f274fe3b5cebd00289de0e4cf647c69d0 (patch)
treec5403d668fd555acb43d8332d4b582b5b2527462
parente6357b86cd025b6c9495452bdbfa6dc51161129d (diff)
proto: Fix docs for UserSquash
-rw-r--r--proto/go/gitalypb/operations.pb.go4
-rw-r--r--proto/operations.proto10
2 files changed, 7 insertions, 7 deletions
diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go
index c9914342a..f8a4cb9ce 100644
--- a/proto/go/gitalypb/operations.pb.go
+++ b/proto/go/gitalypb/operations.pb.go
@@ -3325,7 +3325,7 @@ func (*UserRebaseConfirmableResponse_RebaseSha) isUserRebaseConfirmableResponse_
func (*UserRebaseConfirmableResponse_RebaseApplied) isUserRebaseConfirmableResponse_UserRebaseConfirmableResponsePayload() {
}
-// UserSquashRequest ...
+// UserSquashRequest is a request for the UserSquash RPC.
type UserSquashRequest struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -3432,7 +3432,7 @@ func (x *UserSquashRequest) GetTimestamp() *timestamppb.Timestamp {
return nil
}
-// UserSquashResponse ...
+// UserSquashResponse is a response for the UserSquash RPC.
type UserSquashResponse struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proto/operations.proto b/proto/operations.proto
index ab42c2076..83fe610ec 100644
--- a/proto/operations.proto
+++ b/proto/operations.proto
@@ -942,7 +942,7 @@ message UserRebaseConfirmableResponse {
reserved "git_error";
}
-// UserSquashRequest ...
+// UserSquashRequest is a request for the UserSquash RPC.
message UserSquashRequest {
// repository is the repository into which the squashed commit shall be
// written.
@@ -967,17 +967,17 @@ message UserSquashRequest {
reserved "squash_id";
}
-// UserSquashResponse ...
+// UserSquashResponse is a response for the UserSquash RPC.
message UserSquashResponse {
// squash_sha is the object ID of the squashed commit.
string squash_sha = 1;
- // DEPRECATED: https://gitlab.com/gitlab-org/gitaly/proto/merge_requests/161
+ // Deprecated as custom hooks aren't executed.
reserved 2;
reserved "pre_receive_error";
- // GitError is not used anymore. Instead, this RPC always returns a real
- // error with an optional UserRebaseConfirmableError, which may be set on
+ // git_error is not used anymore. Instead, this RPC always returns a real
+ // error with an optional `UserSquashError`, which may be set on
// special errors.
reserved 3;
reserved "git_error";