Merge branch 'pks-gitaly-merge-pre-receive-error-deprecation' into 'master'

gitaly_client: Don't check for pre-receive-errors in merge responses

See merge request gitlab-org/gitlab!82287

lib/gitlab/gitaly_client/operation_service.rb

@@ -119,10 +119,6 @@ module Gitlab
         response = GitalyClient.call(@repository.storage, :operation_service,
                                      :user_merge_to_ref, request, timeout: GitalyClient.long_timeout)
 
-        if pre_receive_error = response.pre_receive_error.presence
-          raise Gitlab::Git::PreReceiveError, pre_receive_error
-        end
-
         response.commit_id
       end
 
@@ -153,10 +149,6 @@ module Gitlab
 
         second_response = response_enum.next
 
-        if second_response.pre_receive_error.present?
-          raise Gitlab::Git::PreReceiveError, second_response.pre_receive_error
-        end
-
         branch_update = second_response.branch_update
         return if branch_update.nil?
         raise Gitlab::Git::CommitError, 'failed to apply merge to branch' unless branch_update.commit_id.present?