summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2017-12-28 12:09:34 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2017-12-28 12:09:34 -0300
commit7ed28b906948698e239b42b30d772538adbfbec8 (patch)
tree6ff13497e5b767861e2a1cc9d474fec02b77f1fa
parentf1d5e509b52c8c05fd570503389930121e12d87f (diff)
downloadgitlab-ce-7ed28b906948698e239b42b30d772538adbfbec8.tar.gz
Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixed
-rw-r--r--lib/gitlab/git/repository.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 36dc6b820ce..976a42dd776 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