diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-12-28 16:37:55 +0000 |
|---|---|---|
| committer | Tiago <tiagonbotelho@hotmail.com> | 2017-12-29 16:43:13 +0000 |
| commit | 6a8df993631d0b92789a4c6b689a3b7274718794 (patch) | |
| tree | b46903573915103feda2b7298177038bbde4bd10 | |
| parent | 5fbc5f2fc0b044e4ebdf5ae744bc2bf752c2e874 (diff) | |
| download | gitlab-ce-6a8df993631d0b92789a4c6b689a3b7274718794.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
(cherry picked from commit 0ea75205df7646c7682d3145e17a292fd632835b)
7ed28b90 Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixed
| -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 fbdd646ea13..da67683fd15 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -104,7 +104,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 @@ -166,7 +166,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 |