diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-31 15:10:27 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-31 15:10:27 +0000 |
commit | 5facc34f44ce8736078127a5df174a7b52d922b4 (patch) | |
tree | b93fbe904139121e82870cc40e5ab240a97b1f08 /app/uploaders | |
parent | ea1dcaef18edf97b3ac73892d64ebaf5eecd7f68 (diff) | |
download | gitlab-ce-5facc34f44ce8736078127a5df174a7b52d922b4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/uploaders')
-rw-r--r-- | app/uploaders/object_storage.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index d4c74ce277f..8c9c861e1fe 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -187,6 +187,7 @@ module ObjectStorage hash[:TempPath] = workhorse_local_upload_path end + hash[:FeatureFlagExtractBase] = Feature.enabled?(:workhorse_extract_filename_base) hash[:MaximumSize] = maximum_size if maximum_size.present? end end |