Fix find_branch call sites
This commit is contained in:
parent
40ed88b784
commit
9d93a61a70
|
|
@ -174,8 +174,8 @@ class Repository
|
|||
CommitCollection.new(project, commits, ref)
|
||||
end
|
||||
|
||||
def find_branch(name, fresh_repo: true)
|
||||
raw_repository.find_branch(name, fresh_repo)
|
||||
def find_branch(name)
|
||||
raw_repository.find_branch(name)
|
||||
end
|
||||
|
||||
def find_tag(name)
|
||||
|
|
|
|||
|
|
@ -1114,7 +1114,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def can_be_merged?(source_sha, target_branch)
|
||||
if target_sha = find_branch(target_branch, true)&.target
|
||||
if target_sha = find_branch(target_branch)&.target
|
||||
!gitaly_conflicts_client(source_sha, target_sha).conflicts?
|
||||
else
|
||||
false
|
||||
|
|
|
|||
|
|
@ -1022,24 +1022,6 @@ describe Repository do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#find_branch' do
|
||||
context 'fresh_repo is true' do
|
||||
it 'delegates the call to raw_repository' do
|
||||
expect(repository.raw_repository).to receive(:find_branch).with('master', true)
|
||||
|
||||
repository.find_branch('master', fresh_repo: true)
|
||||
end
|
||||
end
|
||||
|
||||
context 'fresh_repo is false' do
|
||||
it 'delegates the call to raw_repository' do
|
||||
expect(repository.raw_repository).to receive(:find_branch).with('master', false)
|
||||
|
||||
repository.find_branch('master', fresh_repo: false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#update_branch_with_hooks' do
|
||||
let(:old_rev) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' } # git rev-parse feature
|
||||
let(:new_rev) { 'a74ae73c1ccde9b974a70e82b901588071dc142a' } # commit whose parent is old_rev
|
||||
|
|
|
|||
Loading…
Reference in New Issue