Commit f6424953 authored by Shinya Maeda's avatar Shinya Maeda

Merge branch '29077-remove-two_step_rebase-feature-flag-2' into 'master'

Remove deprecated rebase code after removal of the two_step_rebase feature flag

Closes #29077

See merge request gitlab-org/gitlab!23880
parents 25f550ea fc4ae0d9
...@@ -1069,24 +1069,6 @@ class Repository ...@@ -1069,24 +1069,6 @@ class Repository
raw_repository.fetch_ref(source_repository.raw_repository, source_ref: source_ref, target_ref: target_ref) raw_repository.fetch_ref(source_repository.raw_repository, source_ref: source_ref, target_ref: target_ref)
end end
# DEPRECATED: https://gitlab.com/gitlab-org/gitaly/issues/1628
def rebase_deprecated(user, merge_request)
rebase_sha = raw.rebase_deprecated(
user,
merge_request.id,
branch: merge_request.source_branch,
branch_sha: merge_request.source_branch_sha,
remote_repository: merge_request.target_project.repository.raw,
remote_branch: merge_request.target_branch
)
# To support the full deprecated behaviour, set the
# `rebase_commit_sha` for the merge_request here and return the value
merge_request.update(rebase_commit_sha: rebase_sha, merge_error: nil)
rebase_sha
end
def rebase(user, merge_request, skip_ci: false) def rebase(user, merge_request, skip_ci: false)
push_options = [] push_options = []
push_options << Gitlab::PushOptions::CI_SKIP if skip_ci push_options << Gitlab::PushOptions::CI_SKIP if skip_ci
......
...@@ -822,17 +822,6 @@ module Gitlab ...@@ -822,17 +822,6 @@ module Gitlab
gitaly_repository_client.create_from_snapshot(url, auth) gitaly_repository_client.create_from_snapshot(url, auth)
end 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) def rebase(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:, push_options: [], &block)
wrapped_gitaly_errors do wrapped_gitaly_errors do
gitaly_operation_client.rebase( gitaly_operation_client.rebase(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment