Merge branch 'gitaly-opt-out' into 'master'
Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixed Closes #38333 See merge request gitlab-org/gitlab-ce!16155
This commit is contained in:
commit
0ea75205df
1 changed files with 2 additions and 2 deletions
|
@ -126,7 +126,7 @@ module Gitlab
|
||||||
end
|
end
|
||||||
|
|
||||||
def exists?
|
def exists?
|
||||||
Gitlab::GitalyClient.migrate(:repository_exists, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |enabled|
|
Gitlab::GitalyClient.migrate(:repository_exists) do |enabled|
|
||||||
if enabled
|
if enabled
|
||||||
gitaly_repository_client.exists?
|
gitaly_repository_client.exists?
|
||||||
else
|
else
|
||||||
|
@ -188,7 +188,7 @@ module Gitlab
|
||||||
end
|
end
|
||||||
|
|
||||||
def local_branches(sort_by: nil)
|
def local_branches(sort_by: nil)
|
||||||
gitaly_migrate(:local_branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
gitaly_migrate(:local_branches) do |is_enabled|
|
||||||
if is_enabled
|
if is_enabled
|
||||||
gitaly_ref_client.local_branches(sort_by: sort_by)
|
gitaly_ref_client.local_branches(sort_by: sort_by)
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue