Merge branch 'zj-move-opt-out-ruby-endpoints' into 'master'
Move Ruby endpoints to OPT_OUT See merge request gitlab-org/gitlab-ce!17561
This commit is contained in:
commit
d282ea8976
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Move Ruby endpoints to OPT_OUT
|
||||
merge_request:
|
||||
author:
|
||||
type: other
|
|
@ -347,7 +347,7 @@ module Gitlab
|
|||
#
|
||||
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/324
|
||||
def to_diff
|
||||
Gitlab::GitalyClient.migrate(:commit_patch) do |is_enabled|
|
||||
Gitlab::GitalyClient.migrate(:commit_patch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
@repository.gitaly_commit_client.patch(id)
|
||||
else
|
||||
|
|
|
@ -228,7 +228,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def has_local_branches?
|
||||
gitaly_migrate(:has_local_branches) do |is_enabled|
|
||||
gitaly_migrate(:has_local_branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
gitaly_repository_client.has_local_branches?
|
||||
else
|
||||
|
@ -715,7 +715,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def add_branch(branch_name, user:, target:)
|
||||
gitaly_migrate(:operation_user_create_branch) do |is_enabled|
|
||||
gitaly_migrate(:operation_user_create_branch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
gitaly_add_branch(branch_name, user, target)
|
||||
else
|
||||
|
@ -725,7 +725,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def add_tag(tag_name, user:, target:, message: nil)
|
||||
gitaly_migrate(:operation_user_add_tag) do |is_enabled|
|
||||
gitaly_migrate(:operation_user_add_tag, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
gitaly_add_tag(tag_name, user: user, target: target, message: message)
|
||||
else
|
||||
|
@ -735,7 +735,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def rm_branch(branch_name, user:)
|
||||
gitaly_migrate(:operation_user_delete_branch) do |is_enabled|
|
||||
gitaly_migrate(:operation_user_delete_branch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
gitaly_operations_client.user_delete_branch(branch_name, user)
|
||||
else
|
||||
|
@ -810,7 +810,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def revert(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:)
|
||||
gitaly_migrate(:revert) do |is_enabled|
|
||||
gitaly_migrate(:revert, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
args = {
|
||||
user: user,
|
||||
commit: commit,
|
||||
|
@ -876,7 +876,7 @@ module Gitlab
|
|||
|
||||
# Delete the specified branch from the repository
|
||||
def delete_branch(branch_name)
|
||||
gitaly_migrate(:delete_branch) do |is_enabled|
|
||||
gitaly_migrate(:delete_branch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
gitaly_ref_client.delete_branch(branch_name)
|
||||
else
|
||||
|
@ -903,7 +903,7 @@ module Gitlab
|
|||
# create_branch("feature")
|
||||
# create_branch("other-feature", "master")
|
||||
def create_branch(ref, start_point = "HEAD")
|
||||
gitaly_migrate(:create_branch) do |is_enabled|
|
||||
gitaly_migrate(:create_branch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
gitaly_ref_client.create_branch(ref, start_point)
|
||||
else
|
||||
|
@ -1010,7 +1010,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def languages(ref = nil)
|
||||
Gitlab::GitalyClient.migrate(:commit_languages) do |is_enabled|
|
||||
gitaly_migrate(:commit_languages, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
gitaly_commit_client.languages(ref)
|
||||
else
|
||||
|
|
|
@ -1004,7 +1004,7 @@ describe Repository do
|
|||
end
|
||||
end
|
||||
|
||||
context 'with Gitaly disabled', :skip_gitaly_mock do
|
||||
context 'with Gitaly disabled', :disable_gitaly do
|
||||
context 'when pre hooks were successful' do
|
||||
it 'runs without errors' do
|
||||
hook = double(trigger: [true, nil])
|
||||
|
@ -1896,7 +1896,7 @@ describe Repository do
|
|||
it_behaves_like 'adding tag'
|
||||
end
|
||||
|
||||
context 'when Gitaly operation_user_add_tag feature is disabled', :skip_gitaly_mock do
|
||||
context 'when Gitaly operation_user_add_tag feature is disabled', :disable_gitaly do
|
||||
it_behaves_like 'adding tag'
|
||||
|
||||
it 'passes commit SHA to pre-receive and update hooks and tag SHA to post-receive hook' do
|
||||
|
@ -1955,7 +1955,7 @@ describe Repository do
|
|||
end
|
||||
end
|
||||
|
||||
context 'with gitaly disabled', :skip_gitaly_mock do
|
||||
context 'with gitaly disabled', :disable_gitaly do
|
||||
it_behaves_like "user deleting a branch"
|
||||
|
||||
let(:old_rev) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' } # git rev-parse feature
|
||||
|
|
Loading…
Reference in New Issue