summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-03-30 15:27:20 +0000
committerStan Hu <stanhu@gmail.com>2019-03-30 15:27:20 +0000
commitafbc827465e6fc0e4eec1308e34637bcd317eb52 (patch)
treea81e417dfd8ac9f087d833fab7ce72375001c6d3 /spec
parent50a1e01fa8959b08df8bfc18940f9310876873b3 (diff)
parentb82ccf2cbc074e36c78dd1e331c6745cb9b71349 (diff)
downloadgitlab-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
Diffstat (limited to 'spec')
-rw-r--r--spec/uploaders/object_storage_spec.rb2
1 files changed, 1 insertions, 1 deletions
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