diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-03-30 15:27:20 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-03-30 15:27:20 +0000 |
| commit | afbc827465e6fc0e4eec1308e34637bcd317eb52 (patch) | |
| tree | a81e417dfd8ac9f087d833fab7ce72375001c6d3 | |
| parent | 50a1e01fa8959b08df8bfc18940f9310876873b3 (diff) | |
| parent | b82ccf2cbc074e36c78dd1e331c6745cb9b71349 (diff) | |
| download | gitlab-ce-afbc827465e6fc0e4eec1308e34637bcd317eb52.tar.gz | |
Merge branch '59309-objectstorage-set-no-acl' into 'master'
Don't try to set any ACL on uploaded objects
Closes #59309
See merge request gitlab-org/gitlab-ce!26781
| -rw-r--r-- | app/uploaders/object_storage.rb | 6 | ||||
| -rw-r--r-- | spec/uploaders/object_storage_spec.rb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index dad6e85fb56..5f8b89f2a24 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -278,8 +278,12 @@ module ObjectStorage self.class.object_store_credentials end + # Set ACL of uploaded objects to not-public (fog-aws)[1] or no ACL at all + # (fog-google). Value is ignored by other supported backends (fog-aliyun, + # fog-openstack, fog-rackspace) + # [1]: https://github.com/fog/fog-aws/blob/daa50bb3717a462baf4d04d0e0cbfc18baacb541/lib/fog/aws/models/storage/file.rb#L152-L159 def fog_public - false + nil end def delete_migrated_file(migrated_file) diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index 533e9d87ea6..9ce9a353913 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -375,7 +375,7 @@ describe ObjectStorage do describe '#fog_public' do subject { uploader.fog_public } - it { is_expected.to eq(false) } + it { is_expected.to eq(nil) } end describe '.workhorse_authorize' do |