diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-15 15:04:17 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-15 15:04:17 +0000 |
| commit | 89f9074fef018107adcb1a866568c05b0a405cec (patch) | |
| tree | 8833cc5e805ecde4daa9df93fb7f50fb1c0c3b58 | |
| parent | abae33a8ec5965a236f2e15ce6e6b6dc88d88537 (diff) | |
| parent | e528ae2c34199340490df78f05d66c50778f96fb (diff) | |
| download | gitlab-ce-89f9074fef018107adcb1a866568c05b0a405cec.tar.gz | |
Merge branch 'feature/bump-gitaly-version-to-0-69-0' into 'master'
Bump Gitaly version to 0.69.0
See merge request gitlab-org/gitlab-ce!16460
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/commit_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 328185caaeb..106d4ac0005 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -0.67.0 +0.69.0 diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb index fed05bb6c64..71b212023d6 100644 --- a/lib/gitlab/gitaly_client/commit_service.rb +++ b/lib/gitlab/gitaly_client/commit_service.rb @@ -177,7 +177,7 @@ module Gitlab response = GitalyClient.call(@repository.storage, :commit_service, :list_commits_by_oid, request, timeout: GitalyClient.medium_timeout) consume_commits_response(response) - rescue GRPC::Unknown # If no repository is found, happens mainly during testing + rescue GRPC::NotFound # If no repository is found, happens mainly during testing [] end |