Use ApplicationSetting.current_without_cache instead of ApplicationSetting.current where applicable
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
e531a0c11c
commit
a46929ea2f
4 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue