summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-10-26 12:08:29 +0000
committerDouwe Maan <douwe@gitlab.com>2017-10-26 12:08:29 +0000
commitb0c419f9cd42eed7e225a7f6c52798adf863bf6c (patch)
treeda10888c757cafae19247048fe78dde8c86151d6
parent98c57e9a9f73409a912189064a7adf0431768b3a (diff)
parentefdf51d838e68d954b0f06a6e01b11db26b9aba3 (diff)
downloadgitlab-ce-b0c419f9cd42eed7e225a7f6c52798adf863bf6c.tar.gz
Merge branch 'an/local_branches_opt_out' into 'master'
Make local_branches OPT_OUT See merge request gitlab-org/gitlab-ce!15045
-rw-r--r--lib/gitlab/git/repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 95265b41878..408616d174b 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -166,7 +166,7 @@ module Gitlab
end
def local_branches(sort_by: nil)
- gitaly_migrate(:local_branches) do |is_enabled|
+ gitaly_migrate(:local_branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
gitaly_ref_client.local_branches(sort_by: sort_by)
else