Commit 597d5a94 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch...

Merge branch '291088-pages-uploader-considers-object-storage-enabled-even-if-bucket-isn-t-configured' into 'master'

Fix pages object storage bucket

See merge request gitlab-org/gitlab!49251
parents 119c575e 12c2b28f
...@@ -128,6 +128,7 @@ class ObjectStoreSettings ...@@ -128,6 +128,7 @@ class ObjectStoreSettings
if section['enabled'] && target_config['bucket'].blank? if section['enabled'] && target_config['bucket'].blank?
missing_bucket_for(store_type) missing_bucket_for(store_type)
next
end end
# If a storage type such as Pages defines its own connection and does not # If a storage type such as Pages defines its own connection and does not
......
...@@ -92,6 +92,7 @@ RSpec.describe ObjectStoreSettings do ...@@ -92,6 +92,7 @@ RSpec.describe ObjectStoreSettings do
config['object_store']['objects']['pages'].delete('bucket') config['object_store']['objects']['pages'].delete('bucket')
expect { subject }.not_to raise_error expect { subject }.not_to raise_error
expect(settings.pages['object_store']).to eq(nil)
end end
it 'allows pages to define its own connection' do it 'allows pages to define its own connection' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment