Commit 89ab32c6 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Branches are fully migrated to Gitaly

Closes: https://gitlab.com/gitlab-org/gitaly/issues/389
parent 143a632e
...@@ -157,12 +157,8 @@ module Gitlab ...@@ -157,12 +157,8 @@ module Gitlab
# Returns an Array of Branches # Returns an Array of Branches
def branches def branches
gitaly_migrate(:branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| wrapped_gitaly_errors do
if is_enabled
gitaly_ref_client.branches gitaly_ref_client.branches
else
branches_filter
end
end end
end end
......
...@@ -1344,24 +1344,6 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -1344,24 +1344,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
end end
end end
# With Gitaly enabled, Gitaly just doesn't return deleted branches.
context 'with deleted branch with Gitaly disabled' do
before do
allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false)
end
it 'returns no results' do
ref = double()
allow(ref).to receive(:name) { 'bad-branch' }
allow(ref).to receive(:target) { raise Rugged::ReferenceError }
branches = double()
allow(branches).to receive(:each) { [ref].each }
allow(repository_rugged).to receive(:branches) { branches }
expect(subject).to be_empty
end
end
it_behaves_like 'wrapping gRPC errors', Gitlab::GitalyClient::RefService, :branches it_behaves_like 'wrapping gRPC errors', Gitlab::GitalyClient::RefService, :branches
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment