diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-04 20:42:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-04 20:42:58 +0300 |
commit | 7114ad8ea2418f8fdc4741c8b7f5b551bcc467a7 (patch) | |
tree | 589d36c0e93fddcea736dd6cb085a89252c6501a /lib/object_storage | |
parent | 0b4b96be1f12bf2a0b9b561daba716e0468a9e61 (diff) |
Add latest changes from gitlab-org/gitlab@13-8-stable-ee
Diffstat (limited to 'lib/object_storage')
-rw-r--r-- | lib/object_storage/direct_upload.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/object_storage/direct_upload.rb b/lib/object_storage/direct_upload.rb index 3a8fa51e198..7f1c30e574d 100644 --- a/lib/object_storage/direct_upload.rb +++ b/lib/object_storage/direct_upload.rb @@ -206,7 +206,7 @@ module ObjectStorage end def requires_multipart_upload? - config.aws? && !has_length && !use_workhorse_s3_client? + config.aws? && !has_length end def upload_id |