diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
commit | b39512ed755239198a9c294b6a45e65c05900235 (patch) | |
tree | d234a3efade1de67c46b9e5a38ce813627726aa7 /config/settings.rb | |
parent | d31474cf3b17ece37939d20082b07f6657cc79a9 (diff) |
Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42
Diffstat (limited to 'config/settings.rb')
-rw-r--r-- | config/settings.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/settings.rb b/config/settings.rb index 35c8ad72bcf..51d54817646 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -109,7 +109,11 @@ class Settings < Settingslogic constant = modul.constants.find { |name| modul.const_get(name, false) == current } value = constant.nil? ? default : modul.const_get(constant, false) if current.is_a? String - value = modul.const_get(current.upcase, false) rescue default + value = begin + modul.const_get(current.upcase, false) + rescue StandardError + default + end end value |