Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 4 deletions

diff --git a/spec/config/object_store_settings_spec.rb b/spec/config/object_store_settings_spec.rb
index 8b507acb827..68b37197ca7 100644
--- a/spec/config/object_store_settings_spec.rb
+++ b/spec/config/object_store_settings_spec.rb
@@ -130,13 +130,14 @@ RSpec.describe ObjectStoreSettings do
         end
       end
 
-      context 'when object storage is selectively disabled for artifacts' do
+      context 'when object storage is disabled for artifacts with no bucket' do
         before do
           config['artifacts'] = {
             'enabled' => true,
-            'object_store' => {
-              'enabled' => false
-            }
+            'object_store' => {}
+          }
+          config['object_store']['objects']['artifacts'] = {
+            'enabled' => false
           }
         end