summaryrefslogtreecommitdiff
path: root/lib/api/settings.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-05-16 17:10:04 +0200
committerRémy Coutable <remy@rymai.me>2018-05-23 16:14:43 +0200
commita46929ea2f162e14ff18dcf32bbcafb74f029b5a (patch)
tree8ad4488f3657089b0b7690bfaf637c1e43d44917 /lib/api/settings.rb
parente531a0c11cebc282029ba735d69c44c39660ca34 (diff)
downloadgitlab-ce-a46929ea2f162e14ff18dcf32bbcafb74f029b5a.tar.gz
Use ApplicationSetting.current_without_cache instead of ApplicationSetting.current where applicable
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/api/settings.rb')
-rw-r--r--lib/api/settings.rb2
1 files changed, 1 insertions, 1 deletions
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