diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-07 09:09:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-07 09:09:18 +0300 |
commit | c793bb6303e1bddb3555577c4c47f46bf9bdcea6 (patch) | |
tree | c69976623d954301a11ab256768903290c7c7878 /lib/gitlab/url_blocker.rb | |
parent | ba06d3edb030174da1e825738cfb700d77f0d8db (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/url_blocker.rb')
-rw-r--r-- | lib/gitlab/url_blocker.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/url_blocker.rb b/lib/gitlab/url_blocker.rb index fe8c2227659..1e447923a39 100644 --- a/lib/gitlab/url_blocker.rb +++ b/lib/gitlab/url_blocker.rb @@ -289,9 +289,10 @@ module Gitlab ObjectStoreSettings::SUPPORTED_TYPES.collect do |type| section_setting = config.try(type) - next unless section_setting + next unless section_setting && section_setting['enabled'] - object_store_setting = section_setting['object_store'] + # Use #to_h to avoid Settingslogic bug: https://gitlab.com/gitlab-org/gitlab/-/issues/286873 + object_store_setting = section_setting['object_store']&.to_h next unless object_store_setting && object_store_setting['enabled'] |