From 045ab84e0b54dd2b8c03d281a8d4f9c15ae26a6e Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 1 Jul 2019 16:44:54 -0700 Subject: Fix broken specs due to cached application settings The /admin panel will now always return an uncached application setting to ensure it always has the most current info. --- app/controllers/admin/application_settings_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 42634bf611e..a570da61d54 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -64,7 +64,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController private def set_application_setting - @application_setting = Gitlab::CurrentSettings.current_application_settings + @application_setting = ApplicationSetting.current_without_cache end def whitelist_query_limiting -- cgit v1.2.3