diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 09:08:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 09:08:52 +0300 |
| commit | fa478f189009649b115136957e2da30d760fe391 (patch) | |
| tree | 32933cd0a238da9c942ad2d02c0c56d55cdf03d2 /lib/gitlab/git | |
| parent | cfbaef3f1c28cdb9b15615215b87167181cb210f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 0120e3be14c..807cfb5f93f 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -822,17 +822,6 @@ module Gitlab gitaly_repository_client.create_from_snapshot(url, auth) end - # DEPRECATED: https://gitlab.com/gitlab-org/gitaly/issues/1628 - def rebase_deprecated(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:) - wrapped_gitaly_errors do - gitaly_operation_client.user_rebase(user, rebase_id, - branch: branch, - branch_sha: branch_sha, - remote_repository: remote_repository, - remote_branch: remote_branch) - end - end - def rebase(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:, push_options: [], &block) wrapped_gitaly_errors do gitaly_operation_client.rebase( |