Automatic merge of gitlab-org/gitlab-ce master

app/uploaders/object_storage.rb

@@ -280,8 +280,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)

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