diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-04-02 09:27:17 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-04-02 09:27:17 +0000 |
| commit | d7583addf21cd4299363a5ce64126c37ca4234ea (patch) | |
| tree | 9a0c5e005c6fa103702f695f824093e5850ccb61 /spec | |
| parent | 91d884ec6b6d636308d74635a5895957b5246c24 (diff) | |
| parent | 8686e01250824e475dc9412c399c44100878a71e (diff) | |
| download | gitlab-ce-d7583addf21cd4299363a5ce64126c37ca4234ea.tar.gz | |
Merge branch 'sh-fix-rugged-tree-entries' into 'master'
Avoid excessive recursive calls with Rugged TreeEntries
Closes #59759
See merge request gitlab-org/gitlab-ce!26813
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/git/tree_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git/tree_spec.rb b/spec/lib/gitlab/git/tree_spec.rb index 60060c41616..7ad3cde97f8 100644 --- a/spec/lib/gitlab/git/tree_spec.rb +++ b/spec/lib/gitlab/git/tree_spec.rb @@ -19,7 +19,7 @@ describe Gitlab::Git::Tree, :seed_helper do it 'returns a list of tree objects' do entries = described_class.where(repository, SeedRepo::Commit::ID, 'files', true) - expect(entries.count).to be > 10 + expect(entries.count).to be >= 5 expect(entries).to all(be_a(Gitlab::Git::Tree)) end |