summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-10 14:52:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-10 14:52:44 +0000
commit86a8eee1b8bd43a1fe962905eb97a1f478cc050b (patch)
tree439816bbaf4a0caf16d579223eb9465e0b0daebc /config
parent1b517a5a19c4aafc6fa6d738b0ee7c1e4a2cce36 (diff)
downloadgitlab-ce-86a8eee1b8bd43a1fe962905eb97a1f478cc050b.tar.gz
Add latest changes from gitlab-org/gitlab@13-6-stable-ee
Diffstat (limited to 'config')
-rw-r--r--config/object_store_settings.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb
index 767fcd7579c..ec433c4dda6 100644
--- a/config/object_store_settings.rb
+++ b/config/object_store_settings.rb
@@ -121,6 +121,7 @@ class ObjectStoreSettings
if section['enabled'] && target_config['bucket'].blank?
missing_bucket_for(store_type)
+ next
end
# Map bucket (external name) -> remote_directory (internal representation)