diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2018-06-07 18:50:35 +0300 |
|---|---|---|
| committer | Francisco Javier López <fjlopez@gitlab.com> | 2018-06-07 18:50:35 +0300 |
| commit | 8bf7dd77d1268b3b4f84eeab610fbb4b6bc544a4 (patch) | |
| tree | 5cea9219c09a980f6176852cda7d236b969de99c | |
| parent | d25c6cd00078c6bee8173e948d78478c0f43fb72 (diff) | |
Re-vendoring
| -rw-r--r-- | changelogs/unreleased/fj-vendoring-ruby-dir.yml | 2 | ||||
| -rw-r--r-- | ruby/vendor/gitlab_git/REVISION | 2 | ||||
| -rw-r--r-- | ruby/vendor/gitlab_git/lib/gitlab/git/lfs_changes.rb | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/changelogs/unreleased/fj-vendoring-ruby-dir.yml b/changelogs/unreleased/fj-vendoring-ruby-dir.yml index 9bc9698e1..f4ac4994d 100644 --- a/changelogs/unreleased/fj-vendoring-ruby-dir.yml +++ b/changelogs/unreleased/fj-vendoring-ruby-dir.yml @@ -1,5 +1,5 @@ --- -title: Vendoring ruby dir to 543459794a96c19e832ccfb6bb855cb60a84247f +title: Vendoring ruby dir to 570c4928aaca1a0842c2dfdc8240f99e72ba1fc4 merge_request: 753 author: type: other diff --git a/ruby/vendor/gitlab_git/REVISION b/ruby/vendor/gitlab_git/REVISION index 8cc28f0e7..a614bd6d5 100644 --- a/ruby/vendor/gitlab_git/REVISION +++ b/ruby/vendor/gitlab_git/REVISION @@ -1 +1 @@ -543459794a96c19e832ccfb6bb855cb60a84247f +570c4928aaca1a0842c2dfdc8240f99e72ba1fc4 diff --git a/ruby/vendor/gitlab_git/lib/gitlab/git/lfs_changes.rb b/ruby/vendor/gitlab_git/lib/gitlab/git/lfs_changes.rb index 320b2ad00..b230289e7 100644 --- a/ruby/vendor/gitlab_git/lib/gitlab/git/lfs_changes.rb +++ b/ruby/vendor/gitlab_git/lib/gitlab/git/lfs_changes.rb @@ -39,7 +39,11 @@ module Gitlab end def git_all_pointers - params = { options: ["--filter=blob:limit=#{Gitlab::Git::Blob::LFS_POINTER_MAX_SIZE}"], require_path: true } + params = { require_path: true } + + if Gitlab::Git.version >= Gitlab::VersionInfo.parse('2.16.0') + params[:options] = ["--filter=blob:limit=#{Gitlab::Git::Blob::LFS_POINTER_MAX_SIZE}"] + end rev_list.all_objects(params) do |object_ids| Gitlab::Git::Blob.batch_lfs_pointers(@repository, object_ids) |