diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-12-28 16:37:55 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-12-28 16:37:55 +0000 |
| commit | 0ea75205df7646c7682d3145e17a292fd632835b (patch) | |
| tree | 9fff83990de693ab979c4a59260fad11676f3978 /lib/gitlab | |
| parent | 73eb40d32b2d5db373519d4888d269416011bf8a (diff) | |
| parent | 7ed28b906948698e239b42b30d772538adbfbec8 (diff) | |
| download | gitlab-ce-0ea75205df7646c7682d3145e17a292fd632835b.tar.gz | |
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
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index a09386d52a5..490bd753eda 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -126,7 +126,7 @@ module Gitlab end def exists? - Gitlab::GitalyClient.migrate(:repository_exists, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |enabled| + Gitlab::GitalyClient.migrate(:repository_exists) do |enabled| if enabled gitaly_repository_client.exists? else @@ -188,7 +188,7 @@ module Gitlab end 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 gitaly_ref_client.local_branches(sort_by: sort_by) else |