Merge branch 'zj-remove-old-rebase' into 'master'

Remove deprecated Rebase RPC

See merge request gitlab-org/gitlab!24785

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

spec/models/repository_spec.rb

@@ -1622,7 +1622,6 @@ describe Repository do
 
     it 'executes the new Gitaly RPC' do
       expect_any_instance_of(Gitlab::GitalyClient::OperationService).to receive(:rebase)
-      expect_any_instance_of(Gitlab::GitalyClient::OperationService).not_to receive(:user_rebase)
 
       repository.rebase(user, merge_request)
     end