diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-20 20:19:29 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-20 20:19:29 +0000 |
| commit | d951f047198d3ee03604fb64f6ad96efae6cba54 (patch) | |
| tree | 3e6294411a97aafda5d1c6057c5017ccf698f489 /lib/gitlab | |
| parent | 96725938c082e9f83c476da4dcb5d1e5b1863830 (diff) | |
| parent | c1827f1c502d6235790c7a3841587842c8ad8bc7 (diff) | |
| download | gitlab-ce-d951f047198d3ee03604fb64f6ad96efae6cba54.tar.gz | |
Merge branch 'sh-fix-rugged-get-tree-entries-recursive' into 'master'
API: Fix recursive flag not working with Rugged get_tree_entries flag
Closes #61979
See merge request gitlab-org/gitlab-ce!28494
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/git/rugged_impl/tree.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/git/rugged_impl/tree.rb b/lib/gitlab/git/rugged_impl/tree.rb index bb13d114d46..9c37bb01961 100644 --- a/lib/gitlab/git/rugged_impl/tree.rb +++ b/lib/gitlab/git/rugged_impl/tree.rb @@ -43,6 +43,8 @@ module Gitlab ordered_entries.concat(tree_entries_from_rugged(repository, sha, entry.path, true)) end end + + ordered_entries end def rugged_populate_flat_path(repository, sha, path, entries) |