diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-08 14:31:10 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-08 14:31:10 +0300 |
| commit | 3013951c7318d6b08d83c6ec96a4d68d031c3a62 (patch) | |
| tree | c33227b782c76afdbebf2660f84556a9806f7a06 /spec/lib/gitlab/git/blob_spec.rb | |
| parent | 62943cd7961ebe9e3f3343302ec6509c40f5f1fb (diff) | |
| parent | ac2cb65ab3dc2688b3a1db9de661dc01ed196177 (diff) | |
Merge branch 'remove-commit-tree' into 'master'
Remove the Commit#tree method
See merge request gitlab-org/gitlab-ce!16236
Diffstat (limited to 'spec/lib/gitlab/git/blob_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/git/blob_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/git/blob_spec.rb b/spec/lib/gitlab/git/blob_spec.rb index 7f5946b1658..07eb5b82d5f 100644 --- a/spec/lib/gitlab/git/blob_spec.rb +++ b/spec/lib/gitlab/git/blob_spec.rb @@ -146,7 +146,7 @@ describe Gitlab::Git::Blob, seed_helper: true do context 'when sha references a tree' do it 'returns nil' do - tree = Gitlab::Git::Commit.find(repository, 'master').tree + tree = repository.rugged.rev_parse('master^{tree}') blob = Gitlab::Git::Blob.raw(repository, tree.oid) @@ -230,7 +230,7 @@ describe Gitlab::Git::Blob, seed_helper: true do end describe '.batch_lfs_pointers' do - let(:tree_object) { Gitlab::Git::Commit.find(repository, 'master').tree } + let(:tree_object) { repository.rugged.rev_parse('master^{tree}') } let(:non_lfs_blob) do Gitlab::Git::Blob.find( |