From b39512ed755239198a9c294b6a45e65c05900235 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 18 Aug 2022 08:17:02 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-3-stable-ee

---
 config/settings.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'config/settings.rb')

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
-- 
cgit v1.2.3