Commit a46929ea authored by Rémy Coutable's avatar Rémy Coutable

Use ApplicationSetting.current_without_cache instead of ApplicationSetting.current where applicable

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent e531a0c1
......@@ -52,7 +52,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
private
def set_application_setting
@application_setting = ApplicationSetting.current
@application_setting = ApplicationSetting.current_without_cache
end
def application_setting_params
......
......@@ -5,7 +5,7 @@ module API
helpers do
def current_settings
@current_setting ||=
(ApplicationSetting.current || ApplicationSetting.create_from_defaults)
(ApplicationSetting.current_without_cache || ApplicationSetting.create_from_defaults)
end
end
......
......@@ -6,7 +6,7 @@ module API
helpers do
def current_settings
@current_setting ||=
(ApplicationSetting.current || ApplicationSetting.create_from_defaults)
(ApplicationSetting.current_without_cache || ApplicationSetting.create_from_defaults)
end
end
......
......@@ -23,7 +23,7 @@ module Banzai
private
def settings
ApplicationSetting.current || ApplicationSetting.create_from_defaults
Gitlab::CurrentSettings.current_application_settings
end
def plantuml_setup
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment