diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-07-03 12:12:03 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-03 12:12:03 +0300 |
| commit | 15aadc665f266e8e974aded0fe1e0c7f1a9eb0fb (patch) | |
| tree | 7cc2d811dfcb6f42fcfcf1fd6f126280a1e4606f /lib/gitlab/gitaly_client | |
| parent | 7e84f353b9c7ef79829923bd5888af5acf0aa8b6 (diff) | |
Make OperationService RPC's mandatory
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 e9d4bb4c4b6..c04183a348f 100644 --- a/lib/gitlab/gitaly_client/operation_service.rb +++ b/lib/gitlab/gitaly_client/operation_service.rb @@ -64,6 +64,8 @@ module Gitlab target_commit = Gitlab::Git::Commit.decorate(@repository, branch.target_commit) Gitlab::Git::Branch.new(@repository, branch.name, target_commit.id, target_commit) + rescue GRPC::FailedPrecondition => ex + raise Gitlab::Git::Repository::InvalidRef, ex end def user_delete_branch(branch_name, user) @@ -133,6 +135,8 @@ module Gitlab request ).branch_update Gitlab::Git::OperationService::BranchUpdate.from_gitaly(branch_update) + rescue GRPC::FailedPrecondition => e + raise Gitlab::Git::CommitError, e end def user_cherry_pick(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:) |