diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-02 15:09:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-02 15:09:08 +0000 |
| commit | 840d5ecdbbf8da3e03a7f0b8b465a89d1519807c (patch) | |
| tree | 4e197815c026a947057f7b5cbcb5e3cf106cc22f /lib/gitlab/gitaly_client | |
| parent | b0107e8756bf3287f8a6221252c800209a9c46f6 (diff) | |
| download | gitlab-ce-840d5ecdbbf8da3e03a7f0b8b465a89d1519807c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/gitaly_client')
| -rw-r--r-- | lib/gitlab/gitaly_client/operation_service.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb index 9ed4b2da09a..87505418ae9 100644 --- a/lib/gitlab/gitaly_client/operation_service.rb +++ b/lib/gitlab/gitaly_client/operation_service.rb @@ -178,6 +178,10 @@ module Gitlab timeout: GitalyClient.long_timeout ) + if response.pre_receive_error.present? + raise Gitlab::Git::PreReceiveError.new("GL-HOOK-ERR: pre-receive hook failed.") + end + Gitlab::Git::OperationService::BranchUpdate.from_gitaly(response.branch_update) rescue GRPC::FailedPrecondition => e raise Gitlab::Git::CommitError, e |