Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-07-02 02:44:54 +0300
committerStan Hu <stanhu@gmail.com>2019-07-02 08:23:01 +0300
commit045ab84e0b54dd2b8c03d281a8d4f9c15ae26a6e (patch)
tree3103be220ae55e425f2a1858fc63c45d3b5690ae /app/controllers
parent07f879f8909572a13256b8a7c5d8cf3c9d16a230 (diff)
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.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/application_settings_controller.rb2
1 files changed, 1 insertions, 1 deletions
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