summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-06-14 10:25:28 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-06-14 10:25:28 +0200
commit89ab32c6b20b9a0e8cde9d7f28759db8f53c7ffb (patch)
treea75b14c6da0939eb8f6ccc2f3579d9bc81b57d04 /lib
parent143a632ebe1772f2c74a892817659a464f3e887c (diff)
downloadgitlab-ce-89ab32c6b20b9a0e8cde9d7f28759db8f53c7ffb.tar.gz
Branches are fully migrated to Gitaly
Closes: https://gitlab.com/gitlab-org/gitaly/issues/389
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/repository.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index f6b21692493..4410b81ed9a 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -157,12 +157,8 @@ module Gitlab
# Returns an Array of Branches
def branches
- gitaly_migrate(:branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
- if is_enabled
- gitaly_ref_client.branches
- else
- branches_filter
- end
+ wrapped_gitaly_errors do
+ gitaly_ref_client.branches
end
end