| ... | ... | @@ -19,7 +19,7 @@ module Gitlab |
|
|
|
user: Gitlab::Git::User.from_gitlab(user).to_gitaly
|
|
|
|
)
|
|
|
|
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service, :user_delete_tag, request, timeout: GitalyClient.medium_timeout)
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service, :user_delete_tag, request, timeout: GitalyClient.long_timeout)
|
|
|
|
|
|
|
|
if pre_receive_error = response.pre_receive_error.presence
|
|
|
|
raise Gitlab::Git::PreReceiveError, pre_receive_error
|
| ... | ... | @@ -35,7 +35,7 @@ module Gitlab |
|
|
|
message: encode_binary(message.to_s)
|
|
|
|
)
|
|
|
|
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service, :user_create_tag, request, timeout: GitalyClient.medium_timeout)
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service, :user_create_tag, request, timeout: GitalyClient.long_timeout)
|
|
|
|
if pre_receive_error = response.pre_receive_error.presence
|
|
|
|
raise Gitlab::Git::PreReceiveError, pre_receive_error
|
|
|
|
elsif response.exists
|
| ... | ... | @@ -55,7 +55,7 @@ module Gitlab |
|
|
|
start_point: encode_binary(start_point)
|
|
|
|
)
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service,
|
|
|
|
:user_create_branch, request)
|
|
|
|
:user_create_branch, request, timeout: GitalyClient.long_timeout)
|
|
|
|
|
|
|
|
if response.pre_receive_error.present?
|
|
|
|
raise Gitlab::Git::PreReceiveError.new(response.pre_receive_error)
|
| ... | ... | @@ -79,7 +79,8 @@ module Gitlab |
|
|
|
oldrev: encode_binary(oldrev)
|
|
|
|
)
|
|
|
|
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service, :user_update_branch, request)
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service,
|
|
|
|
:user_update_branch, request, timeout: GitalyClient.long_timeout)
|
|
|
|
|
|
|
|
if pre_receive_error = response.pre_receive_error.presence
|
|
|
|
raise Gitlab::Git::PreReceiveError, pre_receive_error
|
| ... | ... | @@ -93,7 +94,8 @@ module Gitlab |
|
|
|
user: Gitlab::Git::User.from_gitlab(user).to_gitaly
|
|
|
|
)
|
|
|
|
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service, :user_delete_branch, request)
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service,
|
|
|
|
:user_delete_branch, request, timeout: GitalyClient.long_timeout)
|
|
|
|
|
|
|
|
if pre_receive_error = response.pre_receive_error.presence
|
|
|
|
raise Gitlab::Git::PreReceiveError, pre_receive_error
|
| ... | ... | @@ -111,7 +113,8 @@ module Gitlab |
|
|
|
first_parent_ref: encode_binary(first_parent_ref)
|
|
|
|
)
|
|
|
|
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service, :user_merge_to_ref, request)
|
|
|
|
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
|
| ... | ... | @@ -126,7 +129,8 @@ module Gitlab |
|
|
|
@repository.storage,
|
|
|
|
:operation_service,
|
|
|
|
:user_merge_branch,
|
|
|
|
request_enum.each
|
|
|
|
request_enum.each,
|
|
|
|
timeout: GitalyClient.long_timeout
|
|
|
|
)
|
|
|
|
|
|
|
|
request_enum.push(
|
| ... | ... | @@ -170,7 +174,8 @@ module Gitlab |
|
|
|
@repository.storage,
|
|
|
|
:operation_service,
|
|
|
|
:user_ff_branch,
|
|
|
|
request
|
|
|
|
request,
|
|
|
|
timeout: GitalyClient.long_timeout
|
|
|
|
)
|
|
|
|
|
|
|
|
Gitlab::Git::OperationService::BranchUpdate.from_gitaly(response.branch_update)
|
| ... | ... | @@ -215,6 +220,7 @@ module Gitlab |
|
|
|
:operation_service,
|
|
|
|
:user_rebase,
|
|
|
|
request,
|
|
|
|
timeout: GitalyClient.long_timeout,
|
|
|
|
remote_storage: remote_repository.storage
|
|
|
|
)
|
|
|
|
|
| ... | ... | @@ -236,6 +242,7 @@ module Gitlab |
|
|
|
:operation_service,
|
|
|
|
:user_rebase_confirmable,
|
|
|
|
request_enum.each,
|
|
|
|
timeout: GitalyClient.long_timeout,
|
|
|
|
remote_storage: remote_repository.storage
|
|
|
|
)
|
|
|
|
|
| ... | ... | @@ -286,7 +293,8 @@ module Gitlab |
|
|
|
@repository.storage,
|
|
|
|
:operation_service,
|
|
|
|
:user_squash,
|
|
|
|
request
|
|
|
|
request,
|
|
|
|
timeout: GitalyClient.long_timeout
|
|
|
|
)
|
|
|
|
|
|
|
|
if response.git_error.presence
|
| ... | ... | @@ -310,7 +318,8 @@ module Gitlab |
|
|
|
@repository.storage,
|
|
|
|
:operation_service,
|
|
|
|
:user_update_submodule,
|
|
|
|
request
|
|
|
|
request,
|
|
|
|
timeout: GitalyClient.long_timeout
|
|
|
|
)
|
|
|
|
|
|
|
|
if response.pre_receive_error.present?
|
| ... | ... | @@ -352,7 +361,8 @@ module Gitlab |
|
|
|
end
|
|
|
|
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service,
|
|
|
|
:user_commit_files, req_enum, remote_storage: start_repository.storage)
|
|
|
|
:user_commit_files, req_enum, timeout: GitalyClient.long_timeout,
|
|
|
|
remote_storage: start_repository.storage)
|
|
|
|
|
|
|
|
if (pre_receive_error = response.pre_receive_error.presence)
|
|
|
|
raise Gitlab::Git::PreReceiveError, pre_receive_error
|
| ... | ... | @@ -384,7 +394,8 @@ module Gitlab |
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service, :user_apply_patch, chunks)
|
|
|
|
response = GitalyClient.call(@repository.storage, :operation_service,
|
|
|
|
:user_apply_patch, chunks, timeout: GitalyClient.long_timeout)
|
|
|
|
|
|
|
|
Gitlab::Git::OperationService::BranchUpdate.from_gitaly(response.branch_update)
|
|
|
|
end
|
| ... | ... | @@ -424,7 +435,7 @@ module Gitlab |
|
|
|
:"user_#{rpc}",
|
|
|
|
request,
|
|
|
|
remote_storage: start_repository.storage,
|
|
|
|
timeout: GitalyClient.medium_timeout
|
|
|
|
timeout: GitalyClient.long_timeout
|
|
|
|
)
|
|
|
|
|
|
|
|
handle_cherry_pick_or_revert_response(response)
|
| ... | ... | |
| ... | ... | |