ruby/proto/gitaly/operations_pb.rb in gitaly-14.9.0.pre.rc3 vs ruby/proto/gitaly/operations_pb.rb in gitaly-14.9.0.pre.rc4
- old
+ new
@@ -236,10 +236,16 @@
end
add_message "gitaly.UserSquashResponse" do
optional :squash_sha, :string, 1
optional :git_error, :string, 3
end
+ add_message "gitaly.UserRebaseConfirmableError" do
+ oneof :error do
+ optional :rebase_conflict, :message, 1, "gitaly.MergeConflictError"
+ optional :access_check, :message, 2, "gitaly.AccessCheckError"
+ end
+ end
add_message "gitaly.UserSquashError" do
oneof :error do
optional :resolve_revision, :message, 1, "gitaly.ResolveRevisionError"
optional :rebase_conflict, :message, 2, "gitaly.MergeConflictError"
end
@@ -310,9 +316,10 @@
UserRebaseConfirmableRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRebaseConfirmableRequest").msgclass
UserRebaseConfirmableRequest::Header = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRebaseConfirmableRequest.Header").msgclass
UserRebaseConfirmableResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRebaseConfirmableResponse").msgclass
UserSquashRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserSquashRequest").msgclass
UserSquashResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserSquashResponse").msgclass
+ UserRebaseConfirmableError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRebaseConfirmableError").msgclass
UserSquashError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserSquashError").msgclass
UserApplyPatchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserApplyPatchRequest").msgclass
UserApplyPatchRequest::Header = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserApplyPatchRequest.Header").msgclass
UserApplyPatchResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserApplyPatchResponse").msgclass
UserUpdateSubmoduleRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserUpdateSubmoduleRequest").msgclass