Merge branch 'pks-proto-remove-deprecated-operation-error-fields' into 'master'

operations: Remove deprecated error fields

See merge request gitlab-org/gitaly!4610

1 files changed, 0 insertions, 3 deletions

diff --git a/ruby/proto/gitaly/operations_pb.rb b/ruby/proto/gitaly/operations_pb.rb
index 27df7f653..6671a0e4c 100644
--- a/ruby/proto/gitaly/operations_pb.rb
+++ b/ruby/proto/gitaly/operations_pb.rb
@@ -77,7 +77,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_message "gitaly.UserMergeBranchResponse" do
       optional :commit_id, :string, 1
       optional :branch_update, :message, 3, "gitaly.OperationBranchUpdate"
-      optional :pre_receive_error, :string, 4
     end
     add_message "gitaly.UserMergeBranchError" do
       oneof :error do
@@ -99,7 +98,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     end
     add_message "gitaly.UserMergeToRefResponse" do
       optional :commit_id, :string, 1
-      optional :pre_receive_error, :string, 2
     end
     add_message "gitaly.OperationBranchUpdate" do
       optional :commit_id, :string, 1
@@ -252,7 +250,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     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