diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2022-08-26 10:34:57 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2022-08-26 10:34:57 +0300 |
| commit | 4a258f4f4b5b5f8033d9c4af9fdb6f63738e25ac (patch) | |
| tree | 34ebc4507ea172f1555bd1b5fadcc0b3698c89ad /ruby/proto | |
| parent | ba174830d2869038ba7b6b676f634be89fc3ace2 (diff) | |
| parent | 2e642ccdb2d84226245ffb80721e5979b0a10e1d (diff) | |
Merge branch '4227-convert-usercreatebranch-to-use-structured-errors' into 'master'
Convert UserCreateBranch to use structured errors
Closes #4227
See merge request gitlab-org/gitaly!4835
Diffstat (limited to 'ruby/proto')
| -rw-r--r-- | ruby/proto/gitaly/operations_pb.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ruby/proto/gitaly/operations_pb.rb b/ruby/proto/gitaly/operations_pb.rb index e29ad9932..99e650397 100644 --- a/ruby/proto/gitaly/operations_pb.rb +++ b/ruby/proto/gitaly/operations_pb.rb @@ -19,6 +19,11 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :branch, :message, 1, "gitaly.Branch" optional :pre_receive_error, :string, 2 end + add_message "gitaly.UserCreateBranchError" do + oneof :error do + optional :custom_hook, :message, 1, "gitaly.CustomHookError" + end + end add_message "gitaly.UserUpdateBranchRequest" do optional :repository, :message, 1, "gitaly.Repository" optional :branch_name, :bytes, 2 @@ -307,6 +312,7 @@ end module Gitaly UserCreateBranchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCreateBranchRequest").msgclass UserCreateBranchResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCreateBranchResponse").msgclass + UserCreateBranchError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCreateBranchError").msgclass UserUpdateBranchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserUpdateBranchRequest").msgclass UserUpdateBranchResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserUpdateBranchResponse").msgclass UserDeleteBranchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserDeleteBranchRequest").msgclass |