summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-05-16 17:11:59 +0200
committerRémy Coutable <remy@rymai.me>2018-05-17 18:18:07 +0200
commit96b38c36af2bc99fa78a299fbee081a52832ffca (patch)
tree81b4ef4e7e4bd3120dc95774474601a86461c7f5
parent3b947cdfbd30a86d389d41cdba371cd694784ae1 (diff)
downloadgitlab-ce-45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting.tar.gz
Don't expire the current ApplicationSetting in config/initializers/1_settings.rb45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--config/initializers/1_settings.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 5248bd858a0..dd36700964a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -470,6 +470,3 @@ if Rails.env.test?
Settings.gitlab['default_can_create_group'] = true
Settings.gitlab['default_can_create_team'] = false
end
-
-# Force a refresh of application settings at startup
-ApplicationSetting.expire