diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 15:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 15:09:01 +0300 |
commit | bd497e352ebd279536ae11855871162e82a3f88c (patch) | |
tree | 2241444d4be33e199d7011b872713071a8f8cd41 /lib/gitlab/gitaly_client | |
parent | 0388886f9439fa93efea29a159522aec5643f7c8 (diff) |
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 | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb index 27522f89a5b..67fb0ab9608 100644 --- a/lib/gitlab/gitaly_client/operation_service.rb +++ b/lib/gitlab/gitaly_client/operation_service.rb @@ -203,36 +203,6 @@ module Gitlab start_repository: start_repository) end - # DEPRECATED: https://gitlab.com/gitlab-org/gitaly/issues/1628 - def user_rebase(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:) - request = Gitaly::UserRebaseRequest.new( - repository: @gitaly_repo, - user: Gitlab::Git::User.from_gitlab(user).to_gitaly, - rebase_id: rebase_id.to_s, - branch: encode_binary(branch), - branch_sha: branch_sha, - remote_repository: remote_repository.gitaly_repository, - remote_branch: encode_binary(remote_branch) - ) - - response = GitalyClient.call( - @repository.storage, - :operation_service, - :user_rebase, - request, - timeout: GitalyClient.long_timeout, - remote_storage: remote_repository.storage - ) - - if response.pre_receive_error.presence - raise Gitlab::Git::PreReceiveError, response.pre_receive_error - elsif response.git_error.presence - raise Gitlab::Git::Repository::GitError, response.git_error - else - response.rebase_sha - end - end - def rebase(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:, push_options: []) request_enum = QueueEnumerator.new rebase_sha = nil |