diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
| commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
| tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /lib/object_storage | |
| parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'lib/object_storage')
| -rw-r--r-- | lib/object_storage/direct_upload.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/object_storage/direct_upload.rb b/lib/object_storage/direct_upload.rb index 3dd4e5e27d4..a8b51a95e59 100644 --- a/lib/object_storage/direct_upload.rb +++ b/lib/object_storage/direct_upload.rb @@ -205,7 +205,10 @@ module ObjectStorage end def requires_multipart_upload? - config.aws? && !has_length + return false unless config.aws? + return false if use_workhorse_s3_client? && Feature.enabled?(:s3_omit_multipart_urls) + + !has_length end def upload_id |