summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-03-06 14:52:23 +0100
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-03-07 08:47:53 +0100
commit2cdbfef10916be6062a4df06ddbe53f4d27a8026 (patch)
treec35d0139f0376f0c8acfeeaf368c538c9cbd3c3b
parent0649a1f8359930b84d7295272b1f8e32c32c0d2c (diff)
downloadgitlab-ce-2cdbfef10916be6062a4df06ddbe53f4d27a8026.tar.gz
Move Repository#HasLocalBranches to OPT_OUT
Part of gitlab-org/gitaly#616
-rw-r--r--changelogs/unreleased/zj-move-opt-out-ruby-endpoints.yml5
-rw-r--r--lib/gitlab/git/repository.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-move-opt-out-ruby-endpoints.yml b/changelogs/unreleased/zj-move-opt-out-ruby-endpoints.yml
new file mode 100644
index 00000000000..0ddb42bc80a
--- /dev/null
+++ b/changelogs/unreleased/zj-move-opt-out-ruby-endpoints.yml
@@ -0,0 +1,5 @@
+---
+title: Move Ruby endpoints to OPT_OUT
+merge_request:
+author:
+type: other
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 21c79a7a550..90584b08f17 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -228,7 +228,7 @@ module Gitlab
end
def has_local_branches?
- gitaly_migrate(:has_local_branches) do |is_enabled|
+ gitaly_migrate(:has_local_branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
gitaly_repository_client.has_local_branches?
else