Try and use cache for application settings even when the db is not connectedcurrent-settings-use-request-store-during-request

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 59e86707d3e..1a4ddd38513 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -9,9 +9,9 @@ module Gitlab
     end
 
     def ensure_application_settings!
-      settings = nil
+      settings = ::ApplicationSetting.cached
 
-      if connect_to_db?
+      if !settings && connect_to_db?
         settings = ::ApplicationSetting.current
         settings ||= ::ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
       end