diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-16 17:10:04 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-23 16:14:43 +0200 |
| commit | a46929ea2f162e14ff18dcf32bbcafb74f029b5a (patch) | |
| tree | 8ad4488f3657089b0b7690bfaf637c1e43d44917 | |
| parent | e531a0c11cebc282029ba735d69c44c39660ca34 (diff) | |
| download | gitlab-ce-a46929ea2f162e14ff18dcf32bbcafb74f029b5a.tar.gz | |
Use ApplicationSetting.current_without_cache instead of ApplicationSetting.current where applicable
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 2 | ||||
| -rw-r--r-- | lib/api/settings.rb | 2 | ||||
| -rw-r--r-- | lib/api/v3/settings.rb | 2 | ||||
| -rw-r--r-- | lib/banzai/filter/plantuml_filter.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 8958eab0423..cdfe3d6ab1e 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -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 diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 152df23a327..e31c332b6e4 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -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 diff --git a/lib/api/v3/settings.rb b/lib/api/v3/settings.rb index 9b4ab7630fb..fc56495c8b1 100644 --- a/lib/api/v3/settings.rb +++ b/lib/api/v3/settings.rb @@ -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 diff --git a/lib/banzai/filter/plantuml_filter.rb b/lib/banzai/filter/plantuml_filter.rb index 5325819d828..28933c78966 100644 --- a/lib/banzai/filter/plantuml_filter.rb +++ b/lib/banzai/filter/plantuml_filter.rb @@ -23,7 +23,7 @@ module Banzai private def settings - ApplicationSetting.current || ApplicationSetting.create_from_defaults + Gitlab::CurrentSettings.current_application_settings end def plantuml_setup |